From ef78721f94d71dc4e4650a4164677686fb91afd2 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 2 May 2017 10:42:50 +0200 Subject: [PATCH] fixed regression from previous commit and brought back 'select text' --- .../siacs/conversations/ui/ConversationFragment.java | 3 +++ src/main/res/menu/message_context.xml | 10 +++++----- src/main/res/values/strings.xml | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 3ed133fa9..c180dd9c5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -612,6 +612,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission); MenuItem deleteFile = menu.findItem(R.id.delete_file); MenuItem showErrorMessage = menu.findItem(R.id.show_error_message); + if (!treatAsFile && !GeoHelper.isGeoUri(m.getBody()) && !m.treatAsDownloadable()) { + selectText.setVisible(ListSelectionManager.isSupported()); + } if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { retryDecryption.setVisible(true); } diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 4bef476f7..bd2208846 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -5,18 +5,18 @@ android:id="@+id/select_text" android:title="@string/select_text" android:visible="false"/> + - Block stranger Block entire domain online right now + Retry decryption