Bug 1973366 - Part 4: Refactoring opening collections on the homepage to use FenixBrowserUseCases.loadUrlOrSearch r=android-reviewers,pollymce

- Refactors the existing usage of `HomeActivity.openToBrowserAndLoad` in `handleCollectionOpenTabClicked` to use `FenixBrowserUseCases.loadUrlOrSearch`.
- Open collection tab in existing tab when Homepage as a New Tab is enabled.

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

Author: gabrielluong

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

@@ -464,6 +464,7 @@ class HomeFragment : Fragment() {
             reloadUrlUseCase = components.useCases.sessionUseCases.reload,
             topSitesUseCases = components.useCases.topSitesUseCase,
             marsUseCases = components.useCases.marsUseCases,
+            fenixBrowserUseCases = components.useCases.fenixBrowserUseCases,
             appStore = components.appStore,
             navControllerRef = WeakReference(findNavController()),
             viewLifecycleScope = viewLifecycleOwner.lifecycleScope,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt

@@ -56,6 +56,7 @@ import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.appstate.AppState
 import org.mozilla.fenix.components.appstate.setup.checklist.ChecklistItem
 import org.mozilla.fenix.components.metrics.MetricsUtils
+import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.home.HomeFragment
@@ -249,6 +250,7 @@ class DefaultSessionControlController(
     private val reloadUrlUseCase: SessionUseCases.ReloadUrlUseCase,
     private val topSitesUseCases: TopSitesUseCases,
     private val marsUseCases: MARSUseCases,
+    private val fenixBrowserUseCases: FenixBrowserUseCases,
     private val appStore: AppStore,
     private val navControllerRef: WeakReference<NavController>,
     private val viewLifecycleScope: CoroutineScope,
@@ -285,15 +287,16 @@ class DefaultSessionControlController(
             engine,
             tab,
             onTabRestored = {
-                activity.openToBrowser(BrowserDirection.FromHome)
+                navController.navigate(R.id.browserFragment)
                 selectTabUseCase.invoke(it)
                 reloadUrlUseCase.invoke(it)
             },
             onFailure = {
-                activity.openToBrowserAndLoad(
+                navController.navigate(R.id.browserFragment)
+                fenixBrowserUseCases.loadUrlOrSearch(
                     searchTermOrURL = tab.url,
-                    newTab = true,
-                    from = BrowserDirection.FromHome,
+                    newTab = !settings.enableHomepageAsNewTab,
+                    private = appStore.state.mode.isPrivate,
                 )
             },
         )

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

@@ -59,6 +59,7 @@ import org.mozilla.fenix.components.accounts.FenixFxAEntryPoint
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.appstate.AppState
 import org.mozilla.fenix.components.appstate.setup.checklist.ChecklistItem
+import org.mozilla.fenix.components.usecases.FenixBrowserUseCases
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.FenixGleanTestRule
@@ -100,6 +101,7 @@ class DefaultSessionControlControllerTest {
     private val selectTabUseCase: TabsUseCases = mockk(relaxed = true)
     private val topSitesUseCases: TopSitesUseCases = mockk(relaxed = true)
     private val marsUseCases: MARSUseCases = mockk(relaxed = true)
+    private val fenixBrowserUseCases: FenixBrowserUseCases = mockk(relaxed = true)
     private val settings: Settings = mockk(relaxed = true)
     private val analytics: Analytics = mockk(relaxed = true)
     private val scope = coroutinesTestRule.scope
@@ -186,7 +188,9 @@ class DefaultSessionControlControllerTest {
     }
 
     @Test
-    fun `handleCollectionOpenTabClicked onFailure`() {
+    fun `GIVEN browsing mode is private and collection tab cannot be restored WHEN a collection tab is opened THEN open collection in a new private tab`() {
+        every { appStore.state.mode } returns BrowsingMode.Private
+
         val tab = mockk<ComponentTab> {
             every { url } returns "https://mozilla.org"
             every { restore(filesDir, engine, restoreSessionId = false) } returns null
@@ -199,10 +203,36 @@ class DefaultSessionControlControllerTest {
         assertEquals(null, recordedEvents.single().extra)
 
         verify {
-            activity.openToBrowserAndLoad(
+            navController.navigate(R.id.browserFragment)
+            fenixBrowserUseCases.loadUrlOrSearch(
                 searchTermOrURL = "https://mozilla.org",
                 newTab = true,
-                from = BrowserDirection.FromHome,
+                private = true,
+            )
+        }
+    }
+
+    @Test
+    fun `GIVEN homepage as a new tab is enabled and collection tab cannot be restored WHEN a collection tab is opened THEN open collection tab in existing tab`() {
+        every { settings.enableHomepageAsNewTab } returns true
+
+        val tab = mockk<ComponentTab> {
+            every { url } returns "https://mozilla.org"
+            every { restore(filesDir, engine, restoreSessionId = false) } returns null
+        }
+        createController().handleCollectionOpenTabClicked(tab)
+
+        assertNotNull(Collections.tabRestored.testGetValue())
+        val recordedEvents = Collections.tabRestored.testGetValue()!!
+        assertEquals(1, recordedEvents.size)
+        assertEquals(null, recordedEvents.single().extra)
+
+        verify {
+            navController.navigate(R.id.browserFragment)
+            fenixBrowserUseCases.loadUrlOrSearch(
+                searchTermOrURL = "https://mozilla.org",
+                newTab = false,
+                private = false,
             )
         }
     }
@@ -240,7 +270,7 @@ class DefaultSessionControlControllerTest {
         assertEquals(1, recordedEvents.size)
         assertEquals(null, recordedEvents.single().extra)
 
-        verify { activity.openToBrowser(BrowserDirection.FromHome) }
+        verify { navController.navigate(R.id.browserFragment) }
         verify { selectTabUseCase.selectTab.invoke(restoredTab.id) }
         verify { reloadUrlUseCase.reload.invoke(restoredTab.id) }
     }
@@ -275,7 +305,7 @@ class DefaultSessionControlControllerTest {
         assertEquals(1, recordedEvents.size)
         assertEquals(null, recordedEvents.single().extra)
 
-        verify { activity.openToBrowser(BrowserDirection.FromHome) }
+        verify { navController.navigate(R.id.browserFragment) }
         verify { selectTabUseCase.selectTab.invoke(restoredTab.id) }
         verify { reloadUrlUseCase.reload.invoke(restoredTab.id) }
     }
@@ -1554,6 +1584,7 @@ class DefaultSessionControlControllerTest {
             reloadUrlUseCase = reloadUrlUseCase.reload,
             topSitesUseCases = topSitesUseCases,
             marsUseCases = marsUseCases,
+            fenixBrowserUseCases = fenixBrowserUseCases,
             appStore = appStore,
             navControllerRef = WeakReference(navController),
             viewLifecycleScope = scope,