From f520586dcdb3a05c0cc0ef9843a9ea3293fee10b Mon Sep 17 00:00:00 2001 From: ekager Date: Tue, 17 Nov 2020 12:28:59 -0800 Subject: [PATCH] For #12062 - Remove feature flag for return to browser (#16622) --- app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 5 ----- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index b1ccd04c6..fa6389129 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -35,9 +35,4 @@ object FeatureFlags { * Enables ETP cookie purging */ val etpCookiePurging = Config.channel.isNightlyOrDebug - - /** - * Returns user to browser on cold start if they have open tabs - */ - val returnToBrowserOnColdStart = Config.channel.isNightlyOrDebug } diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 3c6bcdfac..67f662879 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -770,8 +770,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { open fun navigateToBrowserOnColdStart() { // Normal tabs + cold start -> Should go back to browser if we had any tabs open when we left last // except for PBM + Cold Start there won't be any tabs since they're evicted so we never will navigate - if (FeatureFlags.returnToBrowserOnColdStart && - settings().shouldReturnToBrowser && + if (settings().shouldReturnToBrowser && !browsingModeManager.mode.isPrivate ) { openToBrowser(BrowserDirection.FromGlobal, null)