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

Prevent display issue if account has an empty display name

Browse source
This commit is contained in:
Sylvain Berfini 2025-02-12 10:13:23 +01:00
parent 690140c2b8
commit dd454113e8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/linphone/utils/LinphoneUtils.kt
View file

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