mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-06-11 09:44:46 -04:00
58 lines
2.7 KiB
Diff
58 lines
2.7 KiB
Diff
From bff3d5176d9cddfc84f97b7d060f6688ce0ee317 Mon Sep 17 00:00:00 2001
|
|
From: Akash Yadav <itsaky01@gmail.com>
|
|
Date: Mon, 28 Apr 2025 09:47:29 +0530
|
|
Subject: [PATCH] fix(patches): update 'block-cookie-banners.patch' for
|
|
'FIREFOX_138_0_BUILD1'
|
|
|
|
Signed-off-by: Akash Yadav <itsaky01@gmail.com>
|
|
---
|
|
.../src/main/java/org/mozilla/fenix/utils/Settings.kt | 11 ++++-------
|
|
.../fenix/app/src/main/res/xml/preferences.xml | 2 +-
|
|
2 files changed, 5 insertions(+), 8 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..13c10e3251 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
|
|
@@ -751,20 +751,17 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
false,
|
|
)
|
|
|
|
- var shouldUseCookieBannerPrivateMode by lazyFeatureFlagPreference(
|
|
+ var shouldUseCookieBannerPrivateMode by booleanPreference(
|
|
appContext.getPreferenceKey(R.string.pref_key_cookie_banner_private_mode),
|
|
- featureFlag = true,
|
|
- default = { shouldUseCookieBannerPrivateModeDefaultValue },
|
|
+ default = true,
|
|
)
|
|
|
|
- val shouldUseCookieBannerPrivateModeDefaultValue: Boolean
|
|
- get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE_PBM] == 1
|
|
+ val shouldUseCookieBannerPrivateModeDefaultValue: Boolean = true
|
|
|
|
val shouldUseCookieBanner: Boolean
|
|
get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_VALUE] == 1
|
|
|
|
- val shouldShowCookieBannerUI: Boolean
|
|
- get() = cookieBannersSection[CookieBannersSection.FEATURE_UI] == 1
|
|
+ val shouldShowCookieBannerUI: Boolean = true
|
|
|
|
val shouldEnableCookieBannerDetectOnly: Boolean
|
|
get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_DETECT_ONLY] == 1
|
|
diff --git a/mobile/android/fenix/app/src/main/res/xml/preferences.xml b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
|
|
index 3b85a2a548..cad50ee74a 100644
|
|
--- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml
|
|
+++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml
|
|
@@ -118,7 +118,7 @@
|
|
<org.mozilla.fenix.settings.cookiebannerhandling.CustomCBHSwitchPreference
|
|
android:key="@string/pref_key_cookie_banner_private_mode"
|
|
app:iconSpaceReserved="false"
|
|
- app:isPreferenceVisible="false"
|
|
+ app:isPreferenceVisible="true"
|
|
android:title="@string/preferences_cookie_banner_reduction_private_mode" />
|
|
|
|
<androidx.preference.Preference
|
|
--
|
|
2.49.0
|
|
|