From 2172ca587e3d335bf2973fa3efcfeb65feafe220 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Wed, 10 Aug 2022 03:38:13 -0400 Subject: [PATCH] hide resend menu option if messages are not outgoing --- .../thoughtcrime/securesms/ConversationFragment.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index f1d5a1ff6..83e76d010 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -333,13 +333,21 @@ public class ConversationFragment extends MessageSelectorFragment // if one of the selected items cannot be saved, disable saving. boolean canSave = true; + // if one of the selected items is not from self, disable resending. + boolean canResend = true; for (DcMsg messageRecord : messageRecords) { - if (!messageRecord.hasFile()) { + if (canSave && !messageRecord.hasFile()) { canSave = false; + } + if (canResend && !messageRecord.isOutgoing()) { + canResend = false; + } + if (!canSave && !canResend) { break; } } menu.findItem(R.id.menu_context_save_attachment).setVisible(canSave); + menu.findItem(R.id.menu_resend).setVisible(canResend); } static boolean canReplyToMsg(DcMsg dcMsg) {