From f5a76b23e1c82d24618c61e96efebc630c8a0ea2 Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:32:09 +1100
Subject: [PATCH] Disable selecting message for post deprecated legacy groups
 (#950)

---
 .../securesms/conversation/v2/ConversationActivityV2.kt  | 4 +---
 .../conversation/v2/ConversationReactionOverlay.kt       | 9 ++++-----
 .../v2/menus/ConversationActionModeCallback.kt           | 1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index ec77a755db..b41eccc880 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -353,9 +353,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
                 handleSwipeToReply(message)
             },
             onItemLongPress = { message, position, view ->
-                if (!viewModel.isMessageRequestThread &&
-                    viewModel.canReactToMessages
-                ) {
+                if (!viewModel.isMessageRequestThread) {
                     showConversationReaction(message, view)
                 } else {
                     selectMessage(message, position)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
index 6fa639d956..d11fc5e587 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
@@ -552,11 +552,14 @@ class ConversationReactionOverlay : FrameLayout {
         val openGroup = lokiThreadDatabase.getOpenGroupChat(message.threadId)
         val userPublicKey = textSecurePreferences.getLocalNumber()!!
 
+        val isDeprecatedLegacyGroup = recipient.isLegacyGroupRecipient &&
+                deprecationManager.isDeprecated
+
         // control messages and "marked as deleted" messages can only delete
         val isDeleteOnly = message.isDeleted || message.isControlMessage
 
         // Select message
-        if(!isDeleteOnly) {
+        if(!isDeleteOnly && !isDeprecatedLegacyGroup) {
             items += ActionItem(
                 R.attr.menu_select_icon,
                 R.string.select,
@@ -565,10 +568,6 @@ class ConversationReactionOverlay : FrameLayout {
             )
         }
 
-
-        val isDeprecatedLegacyGroup = recipient.isLegacyGroupRecipient &&
-                deprecationManager.isDeprecated
-
         // Reply
         val canWrite = openGroup == null || openGroup.canWrite
         if (canWrite && !message.isPending && !message.isFailed && !message.isOpenGroupInvitation && !isDeleteOnly
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index e6d9a64b86..65f943cc35 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -60,7 +60,6 @@ class ConversationActionModeCallback(
         }
 
 
-
         // Delete message
         menu.findItem(R.id.menu_context_delete_message).isVisible = !isDeprecatedLegacyGroup // can always delete since delete logic will be handled by the VM
         // Ban user