TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 17:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Don't show members button if there are no remote people."

Browse Source 
This reverts commit d4748efd42.
This commit is contained in:
Alex Hart
2020-12-01 12:19:03 -04:00
parent 55c9124c54
commit b59a5c8609
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
View File

@@ -222,13 +222,6 @@ public class WebRtcCallView extends FrameLayout {
int statusBarHeight = ViewUtil.getStatusBarHeight(this); int statusBarHeight = ViewUtil.getStatusBarHeight(this);
statusBarGuideline.setGuidelineBegin(statusBarHeight); 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 @Override
@@ -369,6 +362,14 @@ public class WebRtcCallView extends FrameLayout {
if (recipient.isGroup()) { if (recipient.isGroup()) {
recipientName.setText(getContext().getString(R.string.WebRtcCallView__s_group_call, recipient.getDisplayName(getContext()))); 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 { } else {
recipientName.setText(recipient.getDisplayName(getContext())); recipientName.setText(recipient.getDisplayName(getContext()));
} }

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java
View File

@@ -57,7 +57,7 @@ public final class WebRtcControls {
} }
boolean displayGroupMembersButton() { boolean displayGroupMembersButton() {
return groupCallState.isAtLeast(GroupCallState.CONNECTING) && hasAtLeastOneRemote; return groupCallState.isAtLeast(GroupCallState.CONNECTING);
} }
boolean displayEndCall() { boolean displayEndCall() {

4
app/src/main/res/menu/group_call.xml
View File

@@ -6,10 +6,8 @@
<item <item
android:id="@+id/menu_group_call_participants_list" android:id="@+id/menu_group_call_participants_list"
android:title="@string/WebRtcCallView__view_participants_list" android:title="@string/WebRtcCallView__view_participants_list"
android:visible="false"
app:actionLayout="@layout/show_participants_menu_view" app:actionLayout="@layout/show_participants_menu_view"
app:showAsAction="always" app:showAsAction="always"
tools:ignore="AlwaysShowAction" tools:ignore="AlwaysShowAction" />
tools:visible="true" />
</menu> </menu>