From d4748efd421c2880e08a8883da314cb1c8f8988b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 24 Nov 2020 11:49:40 -0400
Subject: [PATCH] Don't show members button if there are no remote people.

---
 .../components/webrtc/WebRtcCallView.java         | 15 +++++++--------
 .../components/webrtc/WebRtcControls.java         |  2 +-
 app/src/main/res/menu/group_call.xml              |  4 +++-
 3 files changed, 11 insertions(+), 10 deletions(-)

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 b57156d462..45c357f4e8 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
@@ -217,6 +217,13 @@ 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
@@ -357,14 +364,6 @@ 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 88d03bd69e..18aa17133c 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);
+    return groupCallState.isAtLeast(GroupCallState.CONNECTING) && hasAtLeastOneRemote;
   }
 
   boolean displayEndCall() {
diff --git a/app/src/main/res/menu/group_call.xml b/app/src/main/res/menu/group_call.xml
index 37613907ef..d23d7cd120 100644
--- a/app/src/main/res/menu/group_call.xml
+++ b/app/src/main/res/menu/group_call.xml
@@ -6,8 +6,10 @@
     <item
         android:id="@+id/menu_group_call_participants_list"
         android:title="@string/WebRtcCallView__view_participants_list"
+        android:visible="false"
         app:actionLayout="@layout/show_participants_menu_view"
         app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
+        tools:ignore="AlwaysShowAction"
+        tools:visible="true" />
 
 </menu>
\ No newline at end of file