From bd90383a024271f83ebc03d06c2f50b43f416258 Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:37:07 +1100 Subject: [PATCH] Disable three dot menu for kicked groups too (#993) --- .../securesms/conversation/v2/ConversationViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt index ceb8cefa5e..0850fbb797 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt @@ -201,11 +201,11 @@ class ConversationViewModel( } val showOptionsMenu: Boolean - get() = !isMessageRequestThread && !isDeprecatedLegacyGroup && !isKickedGroupV2Thread + get() = !isMessageRequestThread && !isDeprecatedLegacyGroup && !isInactiveGroupV2Thread - private val isKickedGroupV2Thread: Boolean + private val isInactiveGroupV2Thread: Boolean get() = recipient?.isGroupV2Recipient == true && - configFactory.getGroup(AccountId(recipient!!.address.toString()))?.kicked == true + configFactory.getGroup(AccountId(recipient!!.address.toString()))?.shouldPoll == false private val isDeprecatedLegacyGroup: Boolean get() = recipient?.isLegacyGroupRecipient == true && legacyGroupDeprecationManager.isDeprecated