From 4298ae9d96171246dd791424d64e0e10ba2f49b4 Mon Sep 17 00:00:00 2001 From: Mugurell Date: Thu, 8 Dec 2022 10:49:08 +0200 Subject: [PATCH] Bug 1804544 - Disable TCP by default in beta and release --- app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 4 ++-- nimbus.fml.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index cd286c9cf..944c4f008 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -655,7 +655,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { ) val enabledTotalCookieProtection: Boolean - get() = mr2022Sections[Mr2022Section.TCP_FEATURE] == true + get() = Config.channel.isNightlyOrDebug || mr2022Sections[Mr2022Section.TCP_FEATURE] == true /** * Indicates if the total cookie protection CRF should be shown. @@ -663,7 +663,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { var shouldShowTotalCookieProtectionCFR by lazyFeatureFlagPreference( appContext.getPreferenceKey(R.string.pref_key_should_show_total_cookie_protection_popup), featureFlag = true, - default = { mr2022Sections[Mr2022Section.TCP_CFR] == true }, + default = { Config.channel.isNightlyOrDebug || mr2022Sections[Mr2022Section.TCP_CFR] == true }, ) val blockCookiesSelectionInCustomTrackingProtection by stringPreference( diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml index 4c9daba3f..b74a21dd6 100644 --- a/nimbus.fml.yaml +++ b/nimbus.fml.yaml @@ -193,8 +193,8 @@ features: "sync-cfr": true, "wallpapers-selection-tool": true, "jump-back-in-cfr": true, - "tcp-cfr": true, - "tcp-feature": true + "tcp-cfr": false, + "tcp-feature": false, } defaults: - channel: developer