diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java index 37107f19e..63148c056 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java @@ -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)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt index 71c062403..98161d906 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/events/CallParticipant.kt @@ -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) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d08d83b5..22607d23b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1415,6 +1415,7 @@ No one else is here %1$s is in this call + %1$s are in this call %1$s and %2$s are in this call %1$s is presenting