Bug 1973324 - Part 1: Persists private mode when the user is still in private mode and has private tabs opened on warm start r=android-reviewers,Roger a=pascalc

Differential Revision: https://phabricator.services.mozilla.com/D255452

Author: gabrielluong

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

@@ -1114,6 +1114,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
                 return BrowsingMode.fromBoolean(isPrivate = startPrivateMode)
             }
         }
+
+        if (settings().lastKnownMode.isPrivate &&
+            components.core.store.state.getNormalOrPrivateTabs(private = true).isNotEmpty()
+        ) {
+            return BrowsingMode.Private
+        }
+
         return BrowsingMode.Normal
     }
 

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt

@@ -86,18 +86,41 @@ class HomeActivityTest {
     }
 
     @Test
-    fun `GIVEN browsing mode is not set by intent WHEN getModeFromIntentOrLastKnown is called THEN returns normal browsing mode`() {
+    fun `GIVEN browsing mode is not set by intent and private mode with a tab persisted WHEN getModeFromIntentOrLastKnown is called THEN returns normal browsing mode`() {
+        val browserStore = BrowserStore(
+            BrowserState(
+                tabs = listOf(
+                    createTab(url = "https://mozilla.org", private = true),
+                ),
+            ),
+        )
+
         every { testContext.settings() } returns Settings(testContext)
         every { activity.applicationContext } returns testContext
+        every { testContext.components.core.store } returns browserStore
+
         testContext.settings().lastKnownMode = BrowsingMode.Private
 
-        assertEquals(BrowsingMode.Normal, activity.getModeFromIntentOrLastKnown(null))
+        assertEquals(BrowsingMode.Private, activity.getModeFromIntentOrLastKnown(null))
 
         testContext.settings().lastKnownMode = BrowsingMode.Normal
 
         assertEquals(BrowsingMode.Normal, activity.getModeFromIntentOrLastKnown(null))
     }
 
+    @Test
+    fun `GIVEN last known mode is private mode and no tabs persisted WHEN getModeFromIntentOrLastKnown is called THEN returns normal browsing mode`() {
+        val browserStore = BrowserStore()
+
+        every { testContext.settings() } returns Settings(testContext)
+        every { activity.applicationContext } returns testContext
+        every { testContext.components.core.store } returns browserStore
+
+        testContext.settings().lastKnownMode = BrowsingMode.Private
+
+        assertEquals(BrowsingMode.Normal, activity.getModeFromIntentOrLastKnown(null))
+    }
+
     @Test
     fun `getModeFromIntentOrLastKnown returns mode from intent when set`() {
         every { testContext.settings() } returns Settings(testContext)