From 194975d06852394ab08725fd46c967fbcd4ad880 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 23 Aug 2021 10:39:36 -0400
Subject: [PATCH] Fix lobby copy when another of your devices is solely already
 in the group call.

---
 .../securesms/components/webrtc/CallParticipantsState.java    | 4 +++-
 .../java/org/thoughtcrime/securesms/events/CallParticipant.kt | 3 +++
 app/src/main/res/values/strings.xml                           | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

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 37107f19ef..63148c0568 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 71c0624035..98161d9060 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 8d08d83b51..22607d23b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1415,6 +1415,7 @@
 
     <string name="WebRtcCallView__no_one_else_is_here">No one else is here</string>
     <string name="WebRtcCallView__s_is_in_this_call">%1$s is in this call</string>
+    <string name="WebRtcCallView__s_are_in_this_call">%1$s are in this call</string>
     <string name="WebRtcCallView__s_and_s_are_in_this_call">%1$s and %2$s are in this call</string>
     <string name="WebRtcCallView__s_is_presenting">%1$s is presenting</string>