From 71fefcde3901f6c91262293b8209f98ecef98297 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 20 Oct 2020 15:56:18 +0200
Subject: [PATCH 1/3] remove unused resend-option from menu

---
 res/menu/conversation_context.xml                        | 5 -----
 src/org/thoughtcrime/securesms/ConversationFragment.java | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml
index 7316ef546..3c05f3a19 100644
--- a/res/menu/conversation_context.xml
+++ b/res/menu/conversation_context.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:title="@string/menu_resend"
-          android:id="@+id/menu_context_resend"
-          android:visible="false"
-          app:showAsAction="never" />
-
     <item android:title="@string/menu_reply"
           android:id="@+id/menu_context_reply"
           android:icon="?menu_reply_icon"
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index c93709fee..f3afefafc 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -473,9 +473,6 @@ public class ConversationFragment extends Fragment
         getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
     }
 
-    private void handleResendMessage(final DcMsg message) {
-    }
-
     @SuppressLint("RestrictedApi")
     private void handleReplyMessage(final DcMsg message) {
         if (getActivity() != null) {
@@ -928,10 +925,6 @@ public class ConversationFragment extends Fragment
                     handleForwardMessage(getListAdapter().getSelectedItems());
                     actionMode.finish();
                     return true;
-                case R.id.menu_context_resend:
-                    handleResendMessage(getSelectedMessageRecord());
-                    actionMode.finish();
-                    return true;
                 case R.id.menu_context_save_attachment:
                     handleSaveAttachment(getSelectedMessageRecord());
                     return true;

From 27d747ebe4f0d2a17677efeceb3804c174e1ea01 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 20 Oct 2020 16:00:46 +0200
Subject: [PATCH 2/3] use correct showAsAction value (it is overwritten by
 ConversationAdaptiveActionsToolbar, however, using a different value here is
 confusing

---
 res/menu/conversation_context.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml
index 3c05f3a19..0b3c9ffbd 100644
--- a/res/menu/conversation_context.xml
+++ b/res/menu/conversation_context.xml
@@ -33,5 +33,5 @@
 
     <item android:title="@string/reply_privately"
         android:id="@+id/menu_context_reply_privately"
-        app:showAsAction="collapseActionView" />
+        app:showAsAction="never" />
 </menu>

From 36e19c5abb90599a72d8f142b0b2745c713ef0cc Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 20 Oct 2020 16:23:49 +0200
Subject: [PATCH 3/3] do not hide the title with the number of selected items

---
 src/org/thoughtcrime/securesms/ConversationFragment.java       | 1 +
 .../util/views/ConversationAdaptiveActionsToolbar.java         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index f3afefafc..3287add0d 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -781,6 +781,7 @@ public class ConversationFragment extends Fragment
                     setCorrectMenuVisibility(menu);
                     ConversationAdaptiveActionsToolbar.adjustMenuActions(menu, 10, requireActivity().getWindow().getDecorView().getMeasuredWidth());
                     actionMode.setTitle(String.valueOf(getListAdapter().getSelectedItems().size()));
+                    actionMode.setTitleOptionalHint(false); // the title represents important information, also indicating implicitly, more items can be selected
                 }
             }
             else if(messageRecord.isSetupMessage()) {
diff --git a/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
index 40754b135..1f77e4b7d 100644
--- a/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
+++ b/src/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 public class ConversationAdaptiveActionsToolbar extends Toolbar {
 
   private static final int NAVIGATION_DP          = 56;
+  private static final int TITLE_DP               = 48; // estimated, only a number (if >1 items are selected there is more room anyway as there are fewer options)
   private static final int ACTION_VIEW_WIDTH_DP   = 48;
   private static final int OVERFLOW_VIEW_WIDTH_DP = 36;
 
@@ -61,7 +62,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
       }
     }
 
-    int widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP);
+    int widthAllowed = toolbarWidthPx - ViewUtil.dpToPx(NAVIGATION_DP + TITLE_DP);
     int nItemsToShow = Math.min(maxToShow, widthAllowed / ViewUtil.dpToPx(ACTION_VIEW_WIDTH_DP));
 
     if (nItemsToShow < menuSize) {