From 95ce77e0e42073f7a9f2094c86b19ff237b0f3b5 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 28 Jul 2025 11:49:36 +0200
Subject: [PATCH] Prevent crash in message notification if person name is empty

---
 app/src/main/java/org/linphone/contacts/ContactsManager.kt    | 4 ++--
 .../java/org/linphone/notifications/NotificationsManager.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index db271d034..3cc52a221 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -628,7 +628,7 @@ class ContactsManager
         val name = account?.params?.identityAddress?.displayName ?: LinphoneUtils.getDisplayName(
             localAddress
         )
-        val personBuilder = Person.Builder().setName(name)
+        val personBuilder = Person.Builder().setName(name.ifEmpty { "Unknown" })
 
         val photo = account?.params?.pictureUri.orEmpty()
         val bm = ImageUtils.getBitmap(coreContext.context, photo)
@@ -747,7 +747,7 @@ fun Friend.getPerson(): Person {
             "Unknown"
         }
     }
-    personBuilder.setName(personName)
+    personBuilder.setName(personName.orEmpty().ifEmpty { "Unknown" })
 
     val bm: Bitmap? = getAvatarBitmap()
     personBuilder.setIcon(
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 6d9ae1ae9..cad99c132 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -1310,7 +1310,7 @@ class NotificationsManager
                 remoteAddress
             )
             Person.Builder()
-                .setName(subject)
+                .setName(subject.ifEmpty { "Unknown" })
                 .setIcon(
                     AvatarGenerator(context).setInitials(AppUtils.getInitials(subject)).buildIcon()
                 )
@@ -1724,7 +1724,7 @@ class NotificationsManager
     private fun getPerson(friend: Friend?, fallbackDisplayName: String): Person {
         return friend?.getPerson()
             ?: Person.Builder()
-                .setName(if (fallbackDisplayName.isEmpty()) "Unknown" else fallbackDisplayName)
+                .setName(fallbackDisplayName.ifEmpty { "Unknown" })
                 .setIcon(
                     AvatarGenerator(context).setInitials(AppUtils.getInitials(fallbackDisplayName)).buildIcon()
                 )