From f0fb8e62f8cfa4c5a79fee9168becbb48bdbb021 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Sun, 2 Mar 2025 02:09:32 +0100
Subject: [PATCH] show trash/delete icon when selecting a message

---
 .../securesms/ConversationFragment.java          | 12 ++++++------
 .../ConversationAdaptiveActionsToolbar.java      |  4 +++-
 src/main/res/menu/conversation_context.xml       | 16 ++++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
index efa7f4bab..22c0c1fb5 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -324,7 +324,7 @@ public class ConversationFragment extends MessageSelectorFragment
         if (messageRecords.size() > 1) {
             menu.findItem(R.id.menu_context_details).setVisible(false);
             menu.findItem(R.id.menu_context_share).setVisible(false);
-            menu.findItem(R.id.menu_context_reply).setVisible(false);
+            //menu.findItem(R.id.menu_context_reply).setVisible(false);
             menu.findItem(R.id.menu_context_edit).setVisible(false);
             menu.findItem(R.id.menu_context_reply_privately).setVisible(false);
             menu.findItem(R.id.menu_add_to_home_screen).setVisible(false);
@@ -334,7 +334,7 @@ public class ConversationFragment extends MessageSelectorFragment
             menu.findItem(R.id.menu_context_details).setVisible(true);
             menu.findItem(R.id.menu_context_share).setVisible(messageRecord.hasFile());
             boolean canReply = canReplyToMsg(messageRecord);
-            menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
+            //menu.findItem(R.id.menu_context_reply).setVisible(chat.canSend() && canReply);
             boolean canEdit = canEditMsg(messageRecord);
             menu.findItem(R.id.menu_context_edit).setVisible(chat.canSend() && canEdit);
             boolean showReplyPrivately = !dcContext.isCommunity() && chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
@@ -995,10 +995,10 @@ public class ConversationFragment extends MessageSelectorFragment
           } else if (itemId == R.id.menu_context_save_attachment) {
             handleSaveAttachment(getListAdapter().getSelectedItems());
             return true;
-          } else if (itemId == R.id.menu_context_reply) {
-            handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
-            actionMode.finish();
-            return true;
+          // } else if (itemId == R.id.menu_context_reply) {
+          //   handleReplyMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
+          //   actionMode.finish();
+          //   return true;
           } else if (itemId == R.id.menu_context_edit) {
             handleEditMessage(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
             actionMode.finish();
diff --git a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
index 350932b67..df2ba39b4 100644
--- a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
+++ b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
@@ -27,6 +27,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
   private static final int ID_ACTION_2 = R.id.menu_context_copy;
   private static final int ID_ACTION_3 = R.id.menu_context_share;
   private static final int ID_ACTION_4 = R.id.menu_context_forward;
+  private static final int ID_ACTION_5 = R.id.menu_context_delete_message;
 
   private final int   maxShown;
 
@@ -79,7 +80,8 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
       boolean showAsAction = item.getItemId() == ID_ACTION_1
                           || item.getItemId() == ID_ACTION_2
                           || item.getItemId() == ID_ACTION_3
-                          || item.getItemId() == ID_ACTION_4;
+                          || item.getItemId() == ID_ACTION_4
+                          || item.getItemId() == ID_ACTION_5;
 
       if (showAsAction && item.isVisible() && nItemsToShow > 0) {
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
diff --git a/src/main/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml
index ff88646c6..5fb7ee195 100644
--- a/src/main/res/menu/conversation_context.xml
+++ b/src/main/res/menu/conversation_context.xml
@@ -20,6 +20,11 @@
         android:icon="?menu_forward_icon"
         app:showAsAction="ifRoom" />
 
+  <item android:title="@string/delete"
+        android:id="@+id/menu_context_delete_message"
+        android:icon="?menu_trash_icon"
+        app:showAsAction="ifRoom" />
+
   <item android:title="@string/add_to_home_screen"
         android:id="@+id/menu_add_to_home_screen"
         android:visible="false"
@@ -34,9 +39,9 @@
         android:id="@+id/menu_context_details"
         app:showAsAction="never" />
 
-  <item android:title="@string/notify_reply_button"
-        android:id="@+id/menu_context_reply"
-        app:showAsAction="never" />
+  <!-- <item android:title="@string/notify_reply_button" -->
+  <!--       android:id="@+id/menu_context_reply" -->
+  <!--       app:showAsAction="never" /> -->
 
   <item android:title="@string/reply_privately"
         android:id="@+id/menu_context_reply_privately"
@@ -46,11 +51,6 @@
         android:id="@+id/menu_resend"
         app:showAsAction="never" />
 
-  <item android:title="@string/delete"
-        android:id="@+id/menu_context_delete_message"
-        android:icon="?menu_trash_icon"
-        app:showAsAction="never" />
-
   <!-- The `showAsAction` behaviors are managed by
        ConversationAdaptiveActionsToolbar. The `app:showAsAction`
        values set here don't actually make a difference.-->