IronFox/patches/strict_etp.patch

diff -r 5cafe8ddd023 -r a29897d2381c mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt	Mon Oct 28 08:38:19 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt	Mon Oct 28 08:39:05 2024 -0400
@@ -740,12 +740,12 @@
 
     val useStandardTrackingProtection by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_tracking_protection_standard_option),
-        true,
+        false,
     )
 
     val useStrictTrackingProtection by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_tracking_protection_strict_default),
-        false,
+        true,
     )
 
     val useCustomTrackingProtection by booleanPreference(
diff --git a/mobile/android/fenix/app/src/main/res/xml/tracking_protection_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/tracking_protection_preferences.xml
index 712c890683..2dd248c5c8 100644
--- a/mobile/android/fenix/app/src/main/res/xml/tracking_protection_preferences.xml
+++ b/mobile/android/fenix/app/src/main/res/xml/tracking_protection_preferences.xml
@@ -14,82 +14,95 @@
         android:key="@string/pref_key_tracking_protection"
         android:summary="@string/preference_enhanced_tracking_protection_summary"
         android:title="@string/preference_enhanced_tracking_protection"
-        app:iconSpaceReserved="false" />
+        app:iconSpaceReserved="false"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.RadioButtonInfoPreference
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:dependency="@string/pref_key_tracking_protection"
         android:key="@string/pref_key_tracking_protection_standard_option"
         android:summary="@string/preference_enhanced_tracking_protection_standard_description_5"
-        android:title="@string/preference_enhanced_tracking_protection_standard_default_1" />
+        android:title="@string/preference_enhanced_tracking_protection_standard_default_1"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.RadioButtonInfoPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection"
         android:key="@string/pref_key_tracking_protection_strict_default"
         android:summary="@string/preference_enhanced_tracking_protection_strict_description_4"
-        android:title="@string/preference_enhanced_tracking_protection_strict" />
+        android:title="@string/preference_enhanced_tracking_protection_strict"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.RadioButtonInfoPreference
         android:defaultValue="false"
         android:dependency="@string/pref_key_tracking_protection"
         android:key="@string/pref_key_tracking_protection_custom_option"
         android:summary="@string/preference_enhanced_tracking_protection_custom_description_2"
-        android:title="@string/preference_enhanced_tracking_protection_custom" />
+        android:title="@string/preference_enhanced_tracking_protection_custom"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_custom_cookies"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/preference_enhanced_tracking_protection_custom_cookies" />
+        android:title="@string/preference_enhanced_tracking_protection_custom_cookies"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.CustomEtpCookiesOptionsDropDownListPreference
         android:defaultValue="@string/social"
         android:dependency="@string/pref_key_tracking_protection_custom_cookies"
         android:entries="@array/cookies_options_entries"
         android:entryValues="@array/cookies_options_entry_values"
         android:key="@string/pref_key_tracking_protection_custom_cookies_select"
-        app:useSimpleSummaryProvider="true" />
+        app:useSimpleSummaryProvider="true"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_custom_tracking_content"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/preference_enhanced_tracking_protection_custom_tracking_content" />
+        android:title="@string/preference_enhanced_tracking_protection_custom_tracking_content"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.DropDownListPreference
         android:defaultValue="@string/all"
         android:dependency="@string/pref_key_tracking_protection_custom_tracking_content"
         android:entries="@array/tracking_content_options_entries"
         android:entryValues="@array/tracking_content_options_entry_values"
         android:key="@string/pref_key_tracking_protection_custom_tracking_content_select"
-        app:useSimpleSummaryProvider="true" />
+        app:useSimpleSummaryProvider="true"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_custom_cryptominers"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/preference_enhanced_tracking_protection_custom_cryptominers" />
+        android:title="@string/preference_enhanced_tracking_protection_custom_cryptominers"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_custom_fingerprinters"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/preference_enhanced_tracking_protection_custom_known_fingerprinters" />
+        android:title="@string/preference_enhanced_tracking_protection_custom_known_fingerprinters"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_redirect_trackers"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/etp_redirect_trackers_title" />
+        android:title="@string/etp_redirect_trackers_title"
+        app:isPreferenceVisible="false" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:dependency="@string/pref_key_tracking_protection_custom_option"
         android:key="@string/pref_key_tracking_protection_suspected_fingerprinters"
         android:layout="@layout/checkbox_left_preference_etp"
-        android:title="@string/etp_suspected_fingerprinters_title" />
+        android:title="@string/etp_suspected_fingerprinters_title"
+        app:isPreferenceVisible="false" />
     <org.mozilla.fenix.settings.DropDownListPreference
         android:defaultValue="@string/private_string"
         android:dependency="@string/pref_key_tracking_protection_suspected_fingerprinters"
         android:entries="@array/tracking_content_options_entries"
         android:entryValues="@array/suspected_fingerprinters_entry_values"
         android:key="@string/pref_key_tracking_protection_suspected_fingerprinters_select"
-        app:useSimpleSummaryProvider="true" />
+        app:useSimpleSummaryProvider="true"
+        app:isPreferenceVisible="false" />
     <androidx.preference.SwitchPreference
         android:defaultValue="false"
         android:key="@string/pref_key_privacy_enable_global_privacy_control"