From ab252c1554c54bca7091e30bb4ffe3326fc32ead Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 20 Nov 2020 19:50:44 -0800
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/16676 - Do not switch mode on
 last private tab via tab context menu

---
 .../org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt   | 3 ---
 .../fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt    | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index d62ab00c2e47..588a3a86093d 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -13,7 +13,6 @@ import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
 import org.mozilla.fenix.browser.BrowserFragmentDirections
-import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.readermode.ReaderModeController
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
@@ -108,8 +107,6 @@ class DefaultBrowserToolbarController(
                 sessionManager.selectedSession?.let {
                     // When closing the last tab we must show the undo snackbar in the home fragment
                     if (sessionManager.sessionsOfType(it.private).count() == 1) {
-                        // The tab tray always returns to normal mode so do that here too
-                        activity.browsingModeManager.mode = BrowsingMode.Normal
                         homeViewModel.sessionToDelete = it.id
                         navController.navigate(
                             BrowserFragmentDirections.actionGlobalHome()
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
index 3eca1edd438a..a5f543f2b9fb 100644
--- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
@@ -208,7 +208,6 @@ class DefaultBrowserToolbarControllerTest {
 
     @Test
     fun handleToolbarCloseTabPressWithLastPrivateSession() {
-        val browsingModeManager = SimpleBrowsingModeManager(BrowsingMode.Private)
         val item = TabCounterMenu.Item.CloseTab
         val sessions = listOf(
             mockk<Session> {
@@ -218,7 +217,6 @@ class DefaultBrowserToolbarControllerTest {
 
         every { currentSession.private } returns true
         every { sessionManager.sessions } returns sessions
-        every { activity.browsingModeManager } returns browsingModeManager
 
         val controller = createController()
         controller.handleTabCounterItemInteraction(item)
@@ -226,7 +224,6 @@ class DefaultBrowserToolbarControllerTest {
             homeViewModel.sessionToDelete = "1"
             navController.navigate(BrowserFragmentDirections.actionGlobalHome())
         }
-        assertEquals(BrowsingMode.Normal, browsingModeManager.mode)
     }
 
     @Test
-- 
2.11.4.GIT