fix(conversation): disable addMember on a one-on-one conversation wit…

…h deleted account (WPB-10259) 🍒 🍒 (#3471) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Mohamad Jaara <[email protected]>
wireapp · Oct 15, 2024 · d26ae20 · d26ae20
1 parent 2875a4b
commit d26ae20
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 6 deletions.
diff --git a/...in/kotlin/com/wire/android/ui/common/bottomsheet/conversation/ConversationSheetContent.kt b/...in/kotlin/com/wire/android/ui/common/bottomsheet/conversation/ConversationSheetContent.kt
@@ -150,4 +150,6 @@ data class ConversationSheetContent(
     fun canAddToFavourite(): Boolean =
         (conversationTypeDetail is ConversationTypeDetail.Private && conversationTypeDetail.blockingState != BlockingState.BLOCKED)
                 || conversationTypeDetail is ConversationTypeDetail.Group
+
+    fun isAbandonedOneOnOneConversation(participantsCount: Int): Boolean = title.isEmpty() && participantsCount == 1
 }
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
@@ -239,7 +239,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)
@@ -279,6 +283,7 @@ private fun GroupConversationDetailsContent(
     onDeleteGroup: (GroupDialogState) -> Unit,
     groupParticipantsState: GroupConversationParticipantsState,
     isLoading: Boolean,
+    isAbandonedOneOnOneConversation: Boolean,
     onSearchConversationMessagesClick: () -> Unit,
     onConversationMediaClick: () -> Unit
 ) {
@@ -385,7 +390,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),
@@ -601,7 +606,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,8 +55,8 @@ import com.wire.kalium.logic.data.user.SupportedProtocol
 fun GroupConversationParticipants(
     onProfilePressed: (UIParticipant) -> Unit,
     groupParticipantsState: GroupConversationParticipantsState,
-    modifier: Modifier = Modifier,
-    lazyListState: LazyListState = rememberLazyListState()
+    lazyListState: LazyListState,
+    modifier: Modifier = Modifier
 ) {
     val context = LocalContext.current
     Column(modifier = modifier) {
@@ -125,7 +125,13 @@ fun MLSProgressIndicator(
 @PreviewMultipleThemes
 @Composable
 fun PreviewGroupConversationParticipants() = WireTheme {
-    GroupConversationParticipants({}, GroupConversationParticipantsState.PREVIEW)
+    GroupConversationParticipants({}, GroupConversationParticipantsState.PREVIEW, rememberLazyListState())
+}
+
+@PreviewMultipleThemes
+@Composable
+fun PreviewGroupConversationParticipantsAdandonedOneOnOne() = WireTheme {
+    GroupConversationParticipants({}, GroupConversationParticipantsState.PREVIEW, rememberLazyListState())
 }
 
 @PreviewMultipleThemes

diff --git a/...otlin/com/wire/android/ui/common/bottomsheet/conversation/ConversationSheetContentTest.kt b/...otlin/com/wire/android/ui/common/bottomsheet/conversation/ConversationSheetContentTest.kt
@@ -0,0 +1,94 @@
+/*
+ * Wire
+ * Copyright (C) 2024 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+package com.wire.android.ui.common.bottomsheet.conversation
+
+import com.wire.android.ui.home.conversations.details.GroupConversationDetailsViewModelTest.Companion.testGroup
+import com.wire.kalium.logic.data.conversation.Conversation
+import com.wire.kalium.logic.data.id.TeamId
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.internal.assertEquals
+import org.junit.jupiter.api.Test
+
+class ConversationSheetContentTest {
+
+    @Test
+    fun givenTitleIsEmptyAndTheGroupSizeIsOne_whenCallingIsTheGroupAbandoned_returnsTrue() = runTest {
+        val details = testGroup.copy(conversation = testGroup.conversation.copy(teamId = TeamId("team_id")))
+
+        val givenConversationSheetContent = ConversationSheetContent(
+            title = "",
+            conversationId = details.conversation.id,
+            mutingConversationState = details.conversation.mutedStatus,
+            conversationTypeDetail = ConversationTypeDetail.Group(details.conversation.id, details.isSelfUserCreator),
+            selfRole = Conversation.Member.Role.Member,
+            isTeamConversation = details.conversation.isTeamGroup(),
+            isArchived = false,
+            protocol = Conversation.ProtocolInfo.Proteus,
+            mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            isUnderLegalHold = false
+        )
+        val givenParticipantsCount = 1
+
+        assertEquals(true, givenConversationSheetContent.isAbandonedOneOnOneConversation(givenParticipantsCount))
+    }
+
+    @Test
+    fun givenTitleIsEmptyAndTheGroupSizeIsGtOne_whenCallingIsTheGroupAbandoned_returnsFalse() = runTest {
+        val details = testGroup.copy(conversation = testGroup.conversation.copy(teamId = TeamId("team_id")))
+
+        val givenConversationSheetContent = ConversationSheetContent(
+            title = "",
+            conversationId = details.conversation.id,
+            mutingConversationState = details.conversation.mutedStatus,
+            conversationTypeDetail = ConversationTypeDetail.Group(details.conversation.id, details.isSelfUserCreator),
+            selfRole = Conversation.Member.Role.Member,
+            isTeamConversation = details.conversation.isTeamGroup(),
+            isArchived = false,
+            protocol = Conversation.ProtocolInfo.Proteus,
+            mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            isUnderLegalHold = false
+        )
+        val givenParticipantsCount = 3
+
+        assertEquals(false, givenConversationSheetContent.isAbandonedOneOnOneConversation(givenParticipantsCount))
+    }
+
+    @Test
+    fun givenTitleIsNotEmptyAndTheGroupSizeIsOne_whenCallingIsTheGroupAbandoned_returnsFalse() = runTest {
+        val details = testGroup.copy(conversation = testGroup.conversation.copy(teamId = TeamId("team_id")))
+
+        val givenConversationSheetContent = ConversationSheetContent(
+            title = "notEmpty",
+            conversationId = details.conversation.id,
+            mutingConversationState = details.conversation.mutedStatus,
+            conversationTypeDetail = ConversationTypeDetail.Group(details.conversation.id, details.isSelfUserCreator),
+            selfRole = Conversation.Member.Role.Member,
+            isTeamConversation = details.conversation.isTeamGroup(),
+            isArchived = false,
+            protocol = Conversation.ProtocolInfo.Proteus,
+            mlsVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            proteusVerificationStatus = Conversation.VerificationStatus.NOT_VERIFIED,
+            isUnderLegalHold = false
+        )
+        val givenParticipantsCount = 3
+
+        assertEquals(false, givenConversationSheetContent.isAbandonedOneOnOneConversation(givenParticipantsCount))
+    }
+}