commit 578b8542e7ff17f2158912ce3a0b783b5abb56b2
parent d2c40e7c96d8585d050e7da1f09f4603d4ddb852
Author: Roger Yang <royang@mozilla.com>
Date: Tue, 2 Dec 2025 20:07:04 +0000
Bug 1957977 - Remove query parameter stripping Nimbus feature. r=android-reviewers,petru
Differential Revision: https://phabricator.services.mozilla.com/D272329
Diffstat:
3 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/mobile/android/fenix/app/nimbus.fml.yaml b/mobile/android/fenix/app/nimbus.fml.yaml
@@ -83,38 +83,6 @@ features:
description: The drawable displayed in the app menu for Settings
type: String
default: mozac_ic_settings
- query-parameter-stripping:
- description: Features for query parameter stripping.
- variables:
- sections-enabled:
- description: "This property provides a lookup table of whether or not the given section should be enabled."
- type: Map<QueryParameterStrippingSection, String>
- default:
- {
- "query-parameter-stripping": "0",
- "query-parameter-stripping-pmb": "0",
- "query-parameter-stripping-allow-list": "",
- "query-parameter-stripping-strip-list": "",
- }
- defaults:
- - channel: developer
- value: {
- "sections-enabled": {
- "query-parameter-stripping": "0",
- "query-parameter-stripping-pmb": "0",
- "query-parameter-stripping-allow-list": "",
- "query-parameter-stripping-strip-list": "",
- }
- }
- - channel: nightly
- value: {
- "sections-enabled": {
- "query-parameter-stripping": "0",
- "query-parameter-stripping-pmb": "0",
- "query-parameter-stripping-allow-list": "",
- "query-parameter-stripping-strip-list": "",
- }
- }
cookie-banners:
description: Features for cookie banner handling.
variables:
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt
@@ -102,14 +102,10 @@ object GeckoProvider {
context.settings().shouldEnableCookieBannerGlobalRules,
cookieBannerGlobalRulesSubFramesEnabled =
context.settings().shouldEnableCookieBannerGlobalRulesSubFrame,
- queryParameterStripping =
- context.settings().shouldEnableQueryParameterStripping,
- queryParameterStrippingPrivateBrowsing =
- context.settings().shouldEnableQueryParameterStrippingPrivateBrowsing,
- queryParameterStrippingAllowList =
- context.settings().queryParameterStrippingAllowList,
- queryParameterStrippingStripList =
- context.settings().queryParameterStrippingStripList,
+ queryParameterStripping = false,
+ queryParameterStrippingPrivateBrowsing = false,
+ queryParameterStrippingAllowList = "",
+ queryParameterStrippingStripList = "",
allowListBaselineTrackingProtection =
context.settings().strictAllowListBaselineTrackingProtection,
allowListConvenienceTrackingProtection =
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
@@ -61,11 +61,6 @@ import org.mozilla.fenix.nimbus.CookieBannersSection
import org.mozilla.fenix.nimbus.DefaultBrowserPrompt
import org.mozilla.fenix.nimbus.FxNimbus
import org.mozilla.fenix.nimbus.HomeScreenSection
-import org.mozilla.fenix.nimbus.QueryParameterStrippingSection
-import org.mozilla.fenix.nimbus.QueryParameterStrippingSection.QUERY_PARAMETER_STRIPPING
-import org.mozilla.fenix.nimbus.QueryParameterStrippingSection.QUERY_PARAMETER_STRIPPING_ALLOW_LIST
-import org.mozilla.fenix.nimbus.QueryParameterStrippingSection.QUERY_PARAMETER_STRIPPING_PMB
-import org.mozilla.fenix.nimbus.QueryParameterStrippingSection.QUERY_PARAMETER_STRIPPING_STRIP_LIST
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.ShortcutType
import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
@@ -1095,18 +1090,6 @@ class Settings(
val shouldEnableCookieBannerGlobalRulesSubFrame: Boolean
get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES_SUB_FRAMES] == 1
- val shouldEnableQueryParameterStripping: Boolean
- get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING] == "1"
-
- val shouldEnableQueryParameterStrippingPrivateBrowsing: Boolean
- get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_PMB] == "1"
-
- val queryParameterStrippingAllowList: String
- get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_ALLOW_LIST].orEmpty()
-
- val queryParameterStrippingStripList: String
- get() = queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_STRIP_LIST].orEmpty()
-
/**
* Declared as a function for performance purposes. This could be declared as a variable using
* booleanPreference like other members of this class. However, doing so will make it so it will
@@ -2044,10 +2027,6 @@ class Settings(
get() =
FxNimbus.features.cookieBanners.value().sectionsEnabled
- private val queryParameterStrippingSection: Map<QueryParameterStrippingSection, String>
- get() =
- FxNimbus.features.queryParameterStripping.value().sectionsEnabled
-
var signedInFxaAccount by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_fxa_signed_in),
default = false,
