From 069fe7315ebafb4cd4c3b06ca707805a0d9d8156 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Sat, 21 Jan 2023 22:35:55 -0500 Subject: [PATCH] No context menu header, allow copy/quote on text+image message --- .../eu/siacs/conversations/ui/ConversationFragment.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 01284ff88..8d8839396 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1379,7 +1379,6 @@ public class ConversationFragment extends XmppFragment && (t instanceof JingleFileTransferConnection || t instanceof HttpDownloadConnection); activity.getMenuInflater().inflate(R.menu.message_context, menu); - menu.setHeaderTitle(R.string.message_options); MenuItem openWith = menu.findItem(R.id.open_with); MenuItem copyMessage = menu.findItem(R.id.copy_message); MenuItem quoteMessage = menu.findItem(R.id.quote_message); @@ -1400,12 +1399,7 @@ public class ConversationFragment extends XmppFragment m.getStatus() == Message.STATUS_SEND_FAILED && m.getErrorMessage() != null && !Message.ERROR_MESSAGE_CANCELLED.equals(m.getErrorMessage()); - if (!m.isFileOrImage() - && !encrypted - && !m.isGeoUri() - && !m.treatAsDownloadable() - && !unInitiatedButKnownSize - && t == null) { + if (!encrypted && !m.getBody().equals("")) { copyMessage.setVisible(true); quoteMessage.setVisible(!showError && MessageUtils.prepareQuote(m).length() > 0); } -- 2.45.2