fix: disable addMember on a one-on-one conversation with deleted acco…

…unt (WPB-10259)
wireapp · Sep 27, 2024 · 2fa6855 · 2fa6855
1 parent dc785a8
commit 2fa6855
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/...n/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt b/...n/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
@@ -240,7 +240,11 @@ fun GroupConversationDetailsScreen(
         },
         isLoading = viewModel.requestInProgress,
         onSearchConversationMessagesClick = onSearchConversationMessagesClick,
-        onConversationMediaClick = onConversationMediaClick
+        onConversationMediaClick = onConversationMediaClick,
+        isAbandonedOneOnOneConversation = viewModel.conversationSheetContent?.isAbandonedOneOnOneConversation(
+            viewModel.groupParticipantsState.data.allCount
+        ) ?: false
+
     )
 
     val tryAgainSnackBarMessage = stringResource(id = R.string.error_unknown_message)
@@ -280,6 +284,7 @@ private fun GroupConversationDetailsContent(
     onDeleteGroup: (GroupDialogState) -> Unit,
     groupParticipantsState: GroupConversationParticipantsState,
     isLoading: Boolean,
+    isAbandonedOneOnOneConversation: Boolean,
     onSearchConversationMessagesClick: () -> Unit,
     onConversationMediaClick: () -> Unit
 ) {
@@ -390,7 +395,7 @@ private fun GroupConversationDetailsContent(
                         }
 
                         GroupConversationDetailsTabItem.PARTICIPANTS -> {
-                            if (groupParticipantsState.addParticipantsEnabled) {
+                            if (groupParticipantsState.addParticipantsEnabled && !isAbandonedOneOnOneConversation) {
                                 Box(modifier = Modifier.padding(MaterialTheme.wireDimensions.spacing16x)) {
                                     WirePrimaryButton(
                                         text = stringResource(R.string.conversation_details_group_participants_add),
@@ -426,10 +431,6 @@ private fun GroupConversationDetailsContent(
                         groupParticipantsState = groupParticipantsState,
                         onProfilePressed = onProfilePressed,
                         lazyListState = lazyListStates[pageIndex],
-                        isAbandonedOneOnOneConversation = conversationSheetState.conversationSheetContent?.isAbandonedOneOnOneConversation(
-                            groupParticipantsState.data.allCount
-                        ) ?: false
-
                     )
                 }
             }
@@ -610,7 +611,8 @@ fun PreviewGroupConversationDetails() {
             onEditSelfDeletingMessages = {},
             onEditGuestAccess = {},
             onSearchConversationMessagesClick = {},
-            onConversationMediaClick = {}
+            onConversationMediaClick = {},
+            isAbandonedOneOnOneConversation = false
         )
     }
 }
diff --git a/.../wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt b/.../wire/android/ui/home/conversations/details/participants/GroupConversationParticipants.kt
@@ -55,14 +55,14 @@ import com.wire.kalium.logic.data.user.SupportedProtocol
 fun GroupConversationParticipants(
     onProfilePressed: (UIParticipant) -> Unit,
     groupParticipantsState: GroupConversationParticipantsState,
+    modifier: Modifier = Modifier,
     lazyListState: LazyListState = rememberLazyListState(),
-    isAbandonedOneOnOneConversation: Boolean = false
 ) {
     val context = LocalContext.current
     Column {
         LazyColumn(
             state = lazyListState,
-            modifier = Modifier.fillMaxSize()
+            modifier = modifier.fillMaxSize()
         ) {
             item(key = "participants_list_header") {
                 if (BuildConfig.MLS_SUPPORT_ENABLED && BuildConfig.DEVELOPER_FEATURES_ENABLED) {
@@ -128,6 +128,12 @@ fun PreviewGroupConversationParticipants() = WireTheme {
     GroupConversationParticipants({}, GroupConversationParticipantsState.PREVIEW)
 }
 
+@PreviewMultipleThemes
+@Composable
+fun PreviewGroupConversationParticipantsAdandonedOneOnOne() = WireTheme {
+    GroupConversationParticipants({}, GroupConversationParticipantsState.PREVIEW)
+}
+
 @PreviewMultipleThemes
 @Composable
 fun PreviewMLSProgressIndicator() = WireTheme {