From dd454113e8b3988502b835cfa5ed4fd414d7ab5c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 12 Feb 2025 10:13:23 +0100
Subject: [PATCH] Prevent display issue if account has an empty display name

---
 app/src/main/java/org/linphone/utils/LinphoneUtils.kt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 20837bc79..18ea91f98 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -96,7 +96,9 @@ class LinphoneUtils {
         @WorkerThread
         fun getDisplayName(address: Address?): String {
             if (address == null) return "[null]"
-            if (address.displayName == null) {
+
+            val displayName = address.displayName
+            if (displayName.isNullOrEmpty()) {
                 val account = coreContext.core.accountList.find { account ->
                     account.params.identityAddress?.asStringUriOnly() == address.asStringUriOnly()
                 }
@@ -106,8 +108,13 @@ class LinphoneUtils {
                     return localDisplayName
                 }
             }
+
             // Do not return an empty display name
-            return address.displayName ?: address.username ?: address.asString()
+            return if (displayName.isNullOrEmpty()) {
+                address.username ?: address.asString()
+            } else {
+                displayName
+            }
         }
 
         @WorkerThread