From 275ba259be8aaa46b9f0c64aeb87708472834b0b Mon Sep 17 00:00:00 2001
From: Oussama Hassine <oussama.has100@gmail.com>
Date: Wed, 14 Feb 2024 11:19:06 +0100
Subject: [PATCH] fix: crash when answering a call (WPB-6183) - cherrypick
 (#2705)

---
 .../com/wire/android/ui/calling/model/UICallParticipant.kt     | 2 +-
 .../ui/calling/ongoing/participantsview/ParticipantTile.kt     | 3 ++-
 app/src/main/res/values/strings.xml                            | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt b/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt
index 8bbeccfd79..91df9d2c8a 100644
--- a/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/calling/model/UICallParticipant.kt
@@ -25,7 +25,7 @@ import com.wire.kalium.logic.data.id.QualifiedID
 data class UICallParticipant(
     val id: QualifiedID,
     val clientId: String,
-    val name: String = "",
+    val name: String? = null,
     val isMuted: Boolean,
     val isSpeaking: Boolean = false,
     val isCameraOn: Boolean,
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
index 14659df2b4..e444aa4794 100644
--- a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
@@ -94,6 +94,7 @@ fun ParticipantTile(
     onSelfUserVideoPreviewCreated: (view: View) -> Unit,
     onClearSelfUserVideoPreview: () -> Unit
 ) {
+    val defaultUserName = stringResource(id = R.string.calling_participant_tile_default_user_name)
     val alpha =
         if (participantTitleState.hasEstablishedAudio) ContentAlpha.high else ContentAlpha.medium
     Surface(
@@ -154,7 +155,7 @@ fun ParticipantTile(
                         end.linkTo((parent.end))
                     }
                     .widthIn(max = onGoingCallTileUsernameMaxWidth),
-                name = participantTitleState.name,
+                name = participantTitleState.name ?: defaultUserName,
                 isSpeaking = participantTitleState.isSpeaking,
                 hasEstablishedAudio = participantTitleState.hasEstablishedAudio
             )
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 497e9d0b39..899ca987b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -842,6 +842,7 @@
     <string name="calling_confirm_start_call_title_dialog">Start a call</string>
     <string name="calling_confirm_start_call_description_dialog">Are you sure you want to call %1$s people?</string>
     <string name="calling_confirm_start_call_action_dialog">Call</string>
+    <string name="calling_participant_tile_default_user_name">Default</string>
     <!-- Connectivity Status Bar -->
     <string name="connectivity_status_bar_return_to_call">Return to call</string>
     <string name="connectivity_status_bar_connecting">Decrypting messages</string>