Bug 1949591 - Prevent the folder selection screen from presenting any children of a folder that is being moved. r=android-reviewers,matt-tighe

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

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksMiddleware.kt

@@ -340,12 +340,12 @@ internal class BookmarksMiddleware(
                     rootNode.children?.find { it.guid == BookmarkRoot.Mobile.id }?.let {
                         val newChildren = listOf(desktopRoot) + it.children.orEmpty()
                         it.copy(children = newChildren)
-                    }?.let { collectFolders(it) }
+                    }?.let { collectFolders(it, shouldCollect = { node -> !state.isGuidBeingMoved(node.guid) }) }
                 }
             } else {
                 bookmarksStorage.getTree(BookmarkRoot.Mobile.id, recursive = true)
                     ?.let { rootNode ->
-                        collectFolders(rootNode)
+                        collectFolders(rootNode, shouldCollect = { node -> !state.isGuidBeingMoved(node.guid) })
                     }
             }
 
@@ -426,9 +426,10 @@ internal class BookmarksMiddleware(
     private fun collectFolders(
         node: BookmarkNode,
         indentation: Int = 0,
+        shouldCollect: (BookmarkNode) -> Boolean = { _ -> true },
         folders: MutableList<SelectFolderItem> = mutableListOf(),
     ): List<SelectFolderItem> {
-        if (node.type == BookmarkNodeType.FOLDER) {
+        if (node.type == BookmarkNodeType.FOLDER && shouldCollect(node)) {
             folders.add(
                 SelectFolderItem(
                     indentation = indentation,
@@ -440,7 +441,7 @@ internal class BookmarksMiddleware(
             )
 
             node.children?.forEach { child ->
-                folders.addAll(collectFolders(child, indentation + 1))
+                folders.addAll(collectFolders(child, indentation + 1, shouldCollect))
             }
         }
 

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksScreen.kt

@@ -632,10 +632,6 @@ private fun SelectFolderScreen(
                 .padding(vertical = 16.dp),
         ) {
             items(state?.folders ?: listOf()) { folder ->
-                if (store.state.isGuidBeingMoved(folder.guid)) {
-                    return@items
-                }
-
                 if (folder.isDesktopRoot) {
                     Row(modifier = Modifier.padding(start = (40 * folder.indentation).dp)) {
                         // We need to account for not having an icon

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/library/bookmarks/ui/BookmarksMiddlewareTest.kt

@@ -630,6 +630,29 @@ class BookmarksMiddlewareTest {
         assertEquals(6, store.state.bookmarksSelectFolderState?.folders?.count())
     }
 
+    @Test
+    fun `GIVEN a folder with subfolders WHEN select folder sub screen view is loaded THEN load folders into sub screen state without the selected folder`() = runTestOnMain {
+        `when`(bookmarksStorage.countBookmarksInTrees(listOf(BookmarkRoot.Menu.id, BookmarkRoot.Toolbar.id, BookmarkRoot.Unfiled.id))).thenReturn(0u)
+        val rootNode = generateBookmarkFolder("parent", "first", BookmarkRoot.Mobile.id).copy(
+            children = generateBookmarkFolders("parent"),
+        )
+        `when`(bookmarksStorage.getTree(BookmarkRoot.Mobile.id, recursive = true)).thenReturn(rootNode)
+        val middleware = buildMiddleware()
+        val store = middleware.makeStore(
+            initialState = BookmarksState.default.copy(
+                bookmarksSelectFolderState = BookmarksSelectFolderState(outerSelectionGuid = "selection guid"),
+                bookmarksEditFolderState = BookmarksEditFolderState(
+                    parent = BookmarkItem.Folder("Bookmarks", "guid0"),
+                    folder = BookmarkItem.Folder("first", "parent"),
+                ),
+            ),
+        )
+
+        store.dispatch(SelectFolderAction.ViewAppeared)
+
+        assertEquals(0, store.state.bookmarksSelectFolderState?.folders?.count())
+    }
+
     @Test
     fun `GIVEN bookmarks in storage and not signed into sync but have pre-existing desktop bookmarks saved WHEN select folder sub screen view is loaded THEN load folders, including desktop folders into sub screen state`() = runTestOnMain {
         `when`(bookmarksStorage.countBookmarksInTrees(listOf(BookmarkRoot.Menu.id, BookmarkRoot.Toolbar.id, BookmarkRoot.Unfiled.id))).thenReturn(1u)