Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-04 00:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate conversation menu entires.

Browse Source
This commit is contained in:
Cody Henthorne
2022-02-07 10:16:31 -05:00
committed by Alex Hart
parent 3bb4cdf46b
commit d8e0baa9ee
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -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);
}