diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java index 5f34018f2e..faeb50f485 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java @@ -222,13 +222,6 @@ public class WebRtcCallView extends FrameLayout { int statusBarHeight = ViewUtil.getStatusBarHeight(this); statusBarGuideline.setGuidelineBegin(statusBarHeight); - - toolbar.inflateMenu(R.menu.group_call); - - View showParticipants = toolbar.getMenu().findItem(R.id.menu_group_call_participants_list).getActionView(); - showParticipants.setOnClickListener(unused -> showParticipantsList()); - - participantCount = showParticipants.findViewById(R.id.show_participants_menu_counter); } @Override @@ -369,6 +362,14 @@ public class WebRtcCallView extends FrameLayout { if (recipient.isGroup()) { recipientName.setText(getContext().getString(R.string.WebRtcCallView__s_group_call, recipient.getDisplayName(getContext()))); + if (toolbar.getMenu().findItem(R.id.menu_group_call_participants_list) == null) { + toolbar.inflateMenu(R.menu.group_call); + + View showParticipants = toolbar.getMenu().findItem(R.id.menu_group_call_participants_list).getActionView(); + showParticipants.setOnClickListener(unused -> showParticipantsList()); + + participantCount = showParticipants.findViewById(R.id.show_participants_menu_counter); + } } else { recipientName.setText(recipient.getDisplayName(getContext())); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java index 18aa17133c..88d03bd69e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java @@ -57,7 +57,7 @@ public final class WebRtcControls { } boolean displayGroupMembersButton() { - return groupCallState.isAtLeast(GroupCallState.CONNECTING) && hasAtLeastOneRemote; + return groupCallState.isAtLeast(GroupCallState.CONNECTING); } boolean displayEndCall() { diff --git a/app/src/main/res/menu/group_call.xml b/app/src/main/res/menu/group_call.xml index d23d7cd120..37613907ef 100644 --- a/app/src/main/res/menu/group_call.xml +++ b/app/src/main/res/menu/group_call.xml @@ -6,10 +6,8 @@ + tools:ignore="AlwaysShowAction" /> \ No newline at end of file