mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent crash in message notification if person name is empty

Browse source
This commit is contained in:
Sylvain Berfini 2025-07-28 11:49:36 +02:00
parent abbc63354d
commit 2c5dcf366d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/contacts/ContactsManager.kt
View file

@ -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(

4
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -1211,7 +1211,7 @@ class NotificationsManager
remoteAddress
)
Person.Builder()
.setName(subject)
.setName(subject.ifEmpty { "Unknown" })
.setIcon(
AvatarGenerator(context).setInitials(AppUtils.getInitials(subject)).buildIcon()
)
@ -1589,7 +1589,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()
)