Bug 2024810 - Fixed last saved folder cache updating

fmasalha · fmasalha · commit 156f54a8fed7 · 2026-04-15T13:47:00.000-04:00
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksMiddleware.kt
@@ -243,9 +243,7 @@ internal class BookmarksMiddleware(
                     }
 
                     preReductionState.bookmarksEditBookmarkState != null -> {
-                        if (!getNavController().popBackStack()) {
-                            exitBookmarks()
-                        }
+                        val popped = getNavController().popBackStack()
                         lifecycleScope.launch {
                             preReductionState.createBookmarkInfo()?.also {
                                 val result = bookmarksStorage.updateNode(
@@ -261,6 +259,9 @@ internal class BookmarksMiddleware(
                                 }
                             }
                             store.tryDispatchLoadFor(preReductionState.currentFolder.guid)
+                            if (!popped) {
+                                exitBookmarks()
+                            }
                         }
                     }
                     // list screen cases

Original file line number	Diff line number	Diff line change
`@@ -243,9 +243,7 @@ internal class BookmarksMiddleware(`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`preReductionState.bookmarksEditBookmarkState != null -> {`
`246`		`- if (!getNavController().popBackStack()) {`
`247`		`- exitBookmarks()`
`248`		`- }`
	`246`	`+ val popped = getNavController().popBackStack()`
`249`	`247`	`lifecycleScope.launch {`
`250`	`248`	`preReductionState.createBookmarkInfo()?.also {`
`251`	`249`	`val result = bookmarksStorage.updateNode(`
`@@ -261,6 +259,9 @@ internal class BookmarksMiddleware(`
`261`	`259`	`}`
`262`	`260`	`}`
`263`	`261`	`store.tryDispatchLoadFor(preReductionState.currentFolder.guid)`
	`262`	`+ if (!popped) {`
	`263`	`+ exitBookmarks()`
	`264`	`+ }`
`264`	`265`	`}`
`265`	`266`	`}`
`266`	`267`	`// list screen cases`