diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java index e408c37deb..b7c5126a25 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java @@ -922,16 +922,11 @@ public class ConversationParentFragment extends Fragment boolean isActiveV2Group = groupActiveState != null && groupActiveState.isActiveV2Group(); boolean isInActiveGroup = groupActiveState != null && !groupActiveState.isActiveGroup(); - if (isInMessageRequest()) { + if (isInMessageRequest() && recipient != null && !recipient.get().isBlocked()) { if (isActiveGroup) { inflater.inflate(R.menu.conversation_message_requests_group, menu); } - inflater.inflate(R.menu.conversation_message_requests, menu); - - if (recipient != null && recipient.get().isMuted()) inflater.inflate(R.menu.conversation_muted, menu); - else inflater.inflate(R.menu.conversation_unmuted, menu); - super.onCreateOptionsMenu(menu, inflater); } diff --git a/app/src/main/res/menu/conversation_message_requests.xml b/app/src/main/res/menu/conversation_message_requests.xml deleted file mode 100644 index 14cac6e8f1..0000000000 --- a/app/src/main/res/menu/conversation_message_requests.xml +++ /dev/null @@ -1,8 +0,0 @@ - -
\ No newline at end of file