tor-browser

commit 32a9b773b046fed48ae4d5d6d3c122ea5dc53d07
parent 6cda0cf79bbd7f97df2695904070a33e26fd5962
Author: Mugurell <Mugurell@users.noreply.github.com>
Date:   Mon,  6 Oct 2025 17:43:25 +0000

Bug 1988357 - part 2 - Clear backstack when loading a QR code URL from history/bookmarks searches r=android-reviewers,Roger

Use a more reliable way for this - an action that is configured to pop all
destinations between the browser and the home screens, the same action that
is used for history/bookmarks searches done through the old toolbar View.

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddleware.kt
 | 
15
+--------------
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddlewareTest.kt
 | 
3
+++

2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddleware.kt
@@ -14,7 +14,6 @@ import androidx.lifecycle.Lifecycle.State.RESUMED
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
-import androidx.navigation.NavOptions
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -524,19 +523,7 @@ class BrowserToolbarSearchMiddleware(
                             flags = EngineSession.LoadUrlFlags.external(),
                             private = environment?.browsingModeManager?.mode == Private,
                         )
-                        environment?.navController?.navigate(
-                            resId = R.id.browserFragment,
-                            args = null,
-                            navOptions = when (environment?.navController?.currentDestination?.id) {
-                                R.id.historyFragment,
-                                R.id.bookmarkFragment,
-                                    -> NavOptions.Builder()
-                                        .setPopUpTo(R.id.browserFragment, true)
-                                        .build()
-
-                                else -> null
-                            },
-                        )
+                        environment?.navController?.navigate(R.id.action_global_browser)
                     }
                 }
         }
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddlewareTest.kt
@@ -849,6 +849,7 @@ class BrowserToolbarSearchMiddlewareTest {
                 private = false,
             )
         }
+        verify { navController.navigate(R.id.action_global_browser) }
     }
 
     @Test
@@ -882,6 +883,7 @@ class BrowserToolbarSearchMiddlewareTest {
                 private = true,
             )
         }
+        verify { navController.navigate(R.id.action_global_browser) }
     }
 
     @Test
@@ -920,6 +922,7 @@ class BrowserToolbarSearchMiddlewareTest {
                 private = false,
             )
         }
+        verify { navController.navigate(R.id.action_global_browser) }
     }
 
     @Test