From 8f0f6581b23bd7b6cad885947bdd6d569625233b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 7 Aug 2025 16:41:41 +0200
Subject: [PATCH] Use participant device display name in conference if device
 name is empty

---
 .../conference/model/ConferenceParticipantDeviceModel.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt
index 73dde3589..e4c584fee 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/model/ConferenceParticipantDeviceModel.kt
@@ -42,9 +42,9 @@ class ConferenceParticipantDeviceModel
 
     val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(device.address)
 
-    val name = avatarModel.contactName ?: device.name ?: LinphoneUtils.getDisplayName(
-        device.address
-    )
+    val name = avatarModel.contactName ?: device.name.orEmpty().ifEmpty {
+        LinphoneUtils.getDisplayName(device.address)
+    }
 
     val isMuted = MutableLiveData<Boolean>()