Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 12:44:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix lobby copy when another of your devices is solely already in the group call.

Browse Source
This commit is contained in:
Cody Henthorne
2021-08-23 10:39:36 -04:00
committed by Alex Hart
parent b7a067e954
commit 194975d068
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java
View File

@@ -113,7 +113,9 @@ public final class CallParticipantsState {
return context.getString(R.string.WebRtcCallView__no_one_else_is_here);
case 1: {
if (callState == WebRtcViewModel.State.CALL_PRE_JOIN && groupCallState.isNotIdle()) {
return context.getString(R.string.WebRtcCallView__s_is_in_this_call, remoteParticipants.get(0).getShortRecipientDisplayName(context));
return context.getString(remoteParticipants.get(0).isSelf() ? R.string.WebRtcCallView__s_are_in_this_call
: R.string.WebRtcCallView__s_is_in_this_call,
remoteParticipants.get(0).getShortRecipientDisplayName(context));
} else {
if (focusedParticipant != CallParticipant.EMPTY && focusedParticipant.isScreenSharing()) {
return context.getString(R.string.WebRtcCallView__s_is_presenting, focusedParticipant.getShortRecipientDisplayName(context));

3
app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt
View File

@@ -30,6 +30,9 @@ data class CallParticipant constructor(
val isPrimary: Boolean
get() = deviceOrdinal == DeviceOrdinal.PRIMARY
val isSelf: Boolean
get() = recipient.isSelf
fun getRecipientDisplayName(context: Context): String {
return if (recipient.isSelf && isPrimary) {
context.getString(R.string.CallParticipant__you)