fix: do not show confirmation dialogs when unarchiving conversations

wireapp · Oct 5, 2023 · 2194fb7 · 2194fb7
1 parent 2553247
commit 2194fb7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt
@@ -59,6 +59,7 @@ import com.wire.android.ui.home.conversationslist.model.ConversationItem
 import com.wire.android.ui.home.conversationslist.model.ConversationsSource
 import com.wire.android.ui.home.conversationslist.model.DialogState
 import com.wire.android.ui.home.conversationslist.model.GroupDialogState
+import com.wire.android.ui.home.conversationslist.model.isArchive
 import com.wire.android.ui.home.conversationslist.search.SearchConversationScreen
 import com.wire.android.util.extension.openAppInfoScreen
 import com.wire.kalium.logic.data.id.ConversationId
@@ -119,6 +120,16 @@ fun ConversationRouterHomeBridge(
         }
     }
 
+    fun showConfirmationDialogOrUnarchive(): (DialogState) -> Unit {
+        return { dialogState ->
+            if (dialogState.isArchived) {
+                viewModel.moveConversationToArchive(dialogState)
+            } else {
+                conversationRouterHomeState.archiveConversationDialogState.show(dialogState)
+            }
+        }
+    }
+
     with(conversationRouterHomeState) {
         fun openConversationBottomSheet(
             conversationItem: ConversationItem,
@@ -156,7 +167,7 @@ fun ConversationRouterHomeBridge(
                     },
                     addConversationToFavourites = viewModel::addConversationToFavourites,
                     moveConversationToFolder = viewModel::moveConversationToFolder,
-                    updateConversationArchiveStatus = archiveConversationDialogState::show,
+                    updateConversationArchiveStatus = showConfirmationDialogOrUnarchive(),
                     clearConversationContent = clearContentDialogState::show,
                     blockUser = blockUserDialogState::show,
                     unblockUser = unblockUserDialogState::show,
@@ -201,6 +212,7 @@ fun ConversationRouterHomeBridge(
                 ConversationItemType.ALL_CONVERSATIONS ->
                     AllConversationScreenContent(
                         conversations = foldersWithConversations,
+                        isFromArchive = conversationsSource.isArchive(),
                         hasNoConversations = hasNoConversations,
                         onEditConversation = onEditConversationItem,
                         onOpenConversationNotificationsSettings = onEditNotifications,

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/SearchQuery.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/SearchQuery.kt
@@ -29,3 +29,5 @@ enum class ConversationsSource {
     MAIN,
     ARCHIVE
 }
+
+fun ConversationsSource.isArchive(): Boolean = this == ConversationsSource.ARCHIVE
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,3 +29,5 @@ enum class ConversationsSource { @@
         MAIN,
         ARCHIVE
     }
+    fun ConversationsSource.isArchive(): Boolean = this == ConversationsSource.ARCHIVE