From c55c252f9af2b91c5fef8ed47bb64b9390fbadbb Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Tue, 3 Aug 2021 17:29:28 -0400
Subject: [PATCH] Closes #20650: Revert to manually close tab as default
 setting

---
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt  |  4 ++--
 .../test/java/org/mozilla/fenix/utils/SettingsTest.kt  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 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 d5455b65f7..f0da0bad7c 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -332,7 +332,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
 
     var manuallyCloseTabs by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_close_tabs_manually),
-        default = FeatureFlags.inactiveTabs.not()
+        default = true
     )
 
     var closeTabsAfterOneDay by booleanPreference(
@@ -347,7 +347,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
 
     var closeTabsAfterOneMonth by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_close_tabs_after_one_month),
-        default = FeatureFlags.inactiveTabs
+        default = false
     )
 
     var allowThirdPartyRootCerts by booleanPreference(
diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
index 4f8934261c..5b7fff3827 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -225,21 +225,21 @@ class SettingsTest {
     fun shouldManuallyCloseTabs() {
         // When just created
         // Then
-        assertFalse(settings.manuallyCloseTabs)
+        assertTrue(settings.manuallyCloseTabs)
 
         // When
-        settings.manuallyCloseTabs = true
+        settings.manuallyCloseTabs = false
 
         // Then
-        assertTrue(settings.manuallyCloseTabs)
+        assertFalse(settings.manuallyCloseTabs)
     }
 
     @Test
     fun getTabTimeout() {
         // When just created
         // Then
-        assertTrue(settings.closeTabsAfterOneMonth)
-        assertEquals(Settings.ONE_MONTH_MS, settings.getTabTimeout())
+        assertTrue(settings.manuallyCloseTabs)
+        assertEquals(Long.MAX_VALUE, settings.getTabTimeout())
 
         // When
         settings.manuallyCloseTabs = false