From f21e1eb466cad7b7bb894f231514d3e6097d2d9e Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 14 Dec 2020 08:55:06 +1100 Subject: [PATCH] Remove unused button Changes from 671257281 --- .../securesms/conversation/ConversationActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index c75d46fec7..78cfa4575e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -717,9 +717,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity inflater.inflate(R.menu.conversation, menu); - if (isSingleConversation()) { - inflater.inflate(R.menu.conversation_secure, menu); - } +// if (isSingleConversation()) { +// inflater.inflate(R.menu.conversation_secure, menu); +// } if (recipient != null && recipient.isMuted()) inflater.inflate(R.menu.conversation_muted, menu); else inflater.inflate(R.menu.conversation_unmuted, menu); @@ -810,7 +810,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity case R.id.menu_add_shortcut: handleAddShortcut(); return true; case R.id.menu_search: handleSearch(); return true; // case R.id.menu_add_to_contacts: handleAddToContacts(); return true; - case R.id.menu_reset_secure_session: handleResetSecureSession(); return true; +// case R.id.menu_reset_secure_session: handleResetSecureSession(); return true; // case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true;