mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-06-11 09:44:46 -04:00
96 lines
4.7 KiB
Diff
96 lines
4.7 KiB
Diff
From 84b30965972a87d254e9a5377fb3621c440db448 Mon Sep 17 00:00:00 2001
|
|
From: Akash Yadav <itsaky01@gmail.com>
|
|
Date: Mon, 28 Apr 2025 11:39:59 +0530
|
|
Subject: [PATCH] fix(patches): update 'strict_etp.patch' for
|
|
'FIREFOX_138_0_BUILD1'
|
|
|
|
Signed-off-by: Akash Yadav <itsaky01@gmail.com>
|
|
---
|
|
.../java/org/mozilla/fenix/utils/Settings.kt | 20 ++++---------------
|
|
.../xml/tracking_protection_preferences.xml | 16 +++++++++------
|
|
2 files changed, 14 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
index 8e271198b0..0c7a2c731c 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
@@ -741,10 +741,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
default = false,
|
|
)
|
|
|
|
- var shouldUseTrackingProtection by booleanPreference(
|
|
- appContext.getPreferenceKey(R.string.pref_key_tracking_protection),
|
|
- default = true,
|
|
- )
|
|
+ var shouldUseTrackingProtection = true
|
|
|
|
var shouldEnableGlobalPrivacyControl by booleanPreference(
|
|
appContext.getPreferenceKey(R.string.pref_key_privacy_enable_global_privacy_control),
|
|
@@ -851,20 +848,11 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
default = false,
|
|
)
|
|
|
|
- val useStandardTrackingProtection by booleanPreference(
|
|
- appContext.getPreferenceKey(R.string.pref_key_tracking_protection_standard_option),
|
|
- true,
|
|
- )
|
|
+ val useStandardTrackingProtection = false
|
|
|
|
- val useStrictTrackingProtection by booleanPreference(
|
|
- appContext.getPreferenceKey(R.string.pref_key_tracking_protection_strict_default),
|
|
- false,
|
|
- )
|
|
+ val useStrictTrackingProtection = true
|
|
|
|
- val useCustomTrackingProtection by booleanPreference(
|
|
- appContext.getPreferenceKey(R.string.pref_key_tracking_protection_custom_option),
|
|
- false,
|
|
- )
|
|
+ val useCustomTrackingProtection = false
|
|
|
|
@VisibleForTesting(otherwise = PRIVATE)
|
|
fun setStrictETP() {
|
|
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 2760c9c367..10835b79e3 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,25 +14,29 @@
|
|
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"
|
|
--
|
|
2.49.0
|
|
|