From d8e0baa9ee99b45639835ea014bd53d261316275 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 7 Feb 2022 10:16:31 -0500
Subject: [PATCH] Fix duplicate conversation menu entires.

---
 .../conversation/ConversationParentFragment.java          | 7 +------
 app/src/main/res/menu/conversation_message_requests.xml   | 8 --------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 app/src/main/res/menu/conversation_message_requests.xml

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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:title="@string/conversation__menu_view_all_media"
-        android:id="@+id/menu_view_media" />
-
-</menu>
\ No newline at end of file