Bug 2024810 - Fixed last saved folder cache updating

Author: fmasalha

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

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuDialogMiddleware.kt

@@ -273,6 +273,10 @@ class MenuDialogMiddleware(
 
         val parentGuid = parentNode?.guid ?: BookmarkRoot.Mobile.id
 
+        if (targetParentFolderId != parentGuid) {
+            lastSavedFolderCache.setGuid(null)
+        }
+
         val guidToEdit = addBookmarkUseCase(
             url = url,
             title = selectedTab.content.title,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt

@@ -491,8 +491,17 @@ class BrowserToolbarMiddleware(
 
                 selectedTab?.let {
                     scope.launch(ioDispatcher) {
-                        val parentGuid = settings.lastSavedFolderCache.getGuid() ?: BookmarkRoot.Mobile.id
-                        val parentNode = bookmarksStorage.getBookmark(parentGuid).getOrNull()
+                        val targetParentFolderId =
+                            settings.lastSavedFolderCache.getGuid() ?: BookmarkRoot.Mobile.id
+
+                        val parentNode = bookmarksStorage.getBookmark(targetParentFolderId).getOrNull()
+                            ?: bookmarksStorage.getBookmark(BookmarkRoot.Mobile.id).getOrNull()
+                        val parentGuid = parentNode?.guid ?: BookmarkRoot.Mobile.id
+
+                        if (targetParentFolderId != parentGuid) {
+                            settings.lastSavedFolderCache.setGuid(null)
+                        }
+
                         val guidToEdit = useCases.bookmarksUseCases.addBookmark(
                             url = selectedTab.content.url,
                             title = selectedTab.content.title,