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

Fixed missing contacts' avatars in chat room shortcuts

Browse source
This commit is contained in:
Sylvain Berfini 2024-08-08 20:21:29 +02:00
parent 6280ed5f3d
commit ea49d3a411
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -648,7 +648,15 @@ class ContactsManager @UiThread constructor() {
@WorkerThread
fun Friend.getAvatarBitmap(): Bitmap? {
return ImageUtils.getBitmap(coreContext.context, photo)
try {
return ImageUtils.getBitmap(
coreContext.context,
photo ?: getNativeContactPictureUri()?.toString()
)
} catch (numberFormatException: NumberFormatException) {
// Expected for contacts created by Linphone
}
return null
}
@WorkerThread

34
app/src/main/java/org/linphone/utils/ShortcutUtils.kt
View file

@ -74,7 +74,7 @@ class ShortcutUtils {
continue
}
if (count >= 5) {
if (count >= 4) {
Log.i("$TAG We already created [$count] shortcuts, stopping here")
break
}
@ -113,28 +113,28 @@ class ShortcutUtils {
ChatRoom.Capabilities.Basic.toInt()
)
) {
val contact =
coreContext.contactsManager.findContactByAddress(peerAddress)
val person = contact?.getPerson()
if (person != null) {
personsList.add(person)
}
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
peerAddress
)
val contact = avatarModel.friend
val person = contact.getPerson()
personsList.add(person)
subject = contact?.name ?: LinphoneUtils.getDisplayName(peerAddress)
person?.icon ?: AvatarGenerator(context).setInitials(
subject = contact.name ?: LinphoneUtils.getDisplayName(peerAddress)
person.icon ?: AvatarGenerator(context).setInitials(
AppUtils.getInitials(subject)
).buildIcon()
} else if (chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt()) && chatRoom.participants.isNotEmpty()) {
val address = chatRoom.participants.first().address
val contact =
coreContext.contactsManager.findContactByAddress(address)
val person = contact?.getPerson()
if (person != null) {
personsList.add(person)
}
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
address
)
val contact = avatarModel.friend
val person = contact.getPerson()
personsList.add(person)
subject = contact?.name ?: LinphoneUtils.getDisplayName(address)
person?.icon ?: AvatarGenerator(context).setInitials(
subject = contact.name ?: LinphoneUtils.getDisplayName(address)
person.icon ?: AvatarGenerator(context).setInitials(
AppUtils.getInitials(subject)
).buildIcon()
} else {