From 78984f78a862d7764457fa416517bc17964cd38e Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Tue, 29 Aug 2023 18:21:19 +0100
Subject: [PATCH] Revert "Bug 1837325 - Use alternative ways to get backQueue
 elements."

This reverts commit 9313f7c23ab029b816616bb37fac337279967827.

(cherry picked from commit 41414288c044fcd879326503e642c43d5ca4f251)
---
 app/src/main/java/org/mozilla/fenix/ext/NavController.kt  | 2 +-
 .../java/org/mozilla/fenix/search/SearchDialogFragment.kt | 2 +-
 .../org/mozilla/fenix/search/SearchDialogFragmentTest.kt  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/NavController.kt b/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
index e768d72f2..07e9713b9 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/NavController.kt
@@ -68,7 +68,7 @@ fun NavController.navigateWithBreadcrumb(
  */
 @SuppressLint("RestrictedApi")
 fun NavController.hasTopDestination(fragmentClassName: String): Boolean {
-    return this.currentBackStackEntry?.destination?.displayName?.contains(
+    return this.backQueue.lastOrNull()?.destination?.displayName?.contains(
         fragmentClassName,
         true,
     ) == true
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
index 34e8c7c0d..9eade22c5 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
@@ -1021,7 +1021,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
     internal fun getPreviousDestination(): NavBackStackEntry? {
         // This duplicates the platform functionality for "previousBackStackEntry" but additionally skips this entry.
 
-        val descendingEntries = findNavController().currentBackStack.value.reversed().iterator()
+        val descendingEntries = findNavController().backQueue.reversed().iterator()
         // Throw the topmost destination away.
         if (descendingEntries.hasNext()) {
             descendingEntries.next()
diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
index ff71df0ff..c7aa3e72b 100644
--- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogFragmentTest.kt
@@ -50,14 +50,14 @@ internal class SearchDialogFragmentTest {
 
     @Test
     fun `GIVEN this is the only visible fragment WHEN asking for the previous destination THEN return null`() {
-        every { navController.currentBackStack.value } returns ArrayDeque(listOf(getDestination(fragmentName)))
+        every { navController.backQueue } returns ArrayDeque(listOf(getDestination(fragmentName)))
 
         assertNull(fragment.getPreviousDestination())
     }
 
     @Test
     fun `GIVEN this and FragmentB on top of this are visible WHEN asking for the previous destination THEN return null`() {
-        every { navController.currentBackStack.value } returns ArrayDeque(
+        every { navController.backQueue } returns ArrayDeque(
             listOf(
                 getDestination(fragmentName),
                 getDestination("FragmentB"),
@@ -70,7 +70,7 @@ internal class SearchDialogFragmentTest {
     @Test
     fun `GIVEN FragmentA, this and FragmentB are visible WHEN asking for the previous destination THEN return FragmentA`() {
         val fragmentADestination = getDestination("FragmentA")
-        every { navController.currentBackStack.value } returns ArrayDeque(
+        every { navController.backQueue } returns ArrayDeque(
             listOf(
                 fragmentADestination,
                 getDestination(fragmentName),
@@ -84,7 +84,7 @@ internal class SearchDialogFragmentTest {
     @Test
     fun `GIVEN FragmentA and this on top of it are visible WHEN asking for the previous destination THEN return FragmentA`() {
         val fragmentADestination = getDestination("FragmentA")
-        every { navController.currentBackStack.value } returns ArrayDeque(
+        every { navController.backQueue } returns ArrayDeque(
             listOf(
                 fragmentADestination,
                 getDestination(fragmentName),