kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix duplicate conversation menu entires.
rodzic
3bb4cdf46b
commit
d8e0baa9ee
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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>
|
Ładowanie…
Reference in New Issue