From 8d762d09e06b76360c74d91abe77e80fe082ddb6 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 3 May 2022 09:23:37 +0200 Subject: [PATCH] Fixed generated avatar issue --- app/src/main/java/org/linphone/utils/DataBindingUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt index f2a3aa78a..f91cf6be9 100644 --- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt +++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt @@ -343,7 +343,7 @@ private fun loadContactPictureWithCoil( ) { if (contact != null) { val context = imageView.context - val displayName = contact.displayName.value.orEmpty() + val displayName = contact.contact.value?.name ?: contact.displayName.value.orEmpty() val source = if (useThumbnail) contact.thumbnailUri else contact.pictureUri imageView.load(source) { transformations(CircleCropTransformation()) @@ -352,7 +352,7 @@ private fun loadContactPictureWithCoil( val bg = AppCompatResources.getDrawable(context, R.drawable.generated_avatar_bg) imageView.background = bg AppCompatResources.getDrawable(context, R.drawable.icon_multiple_contacts_avatar) - } else if (displayName.isEmpty() || displayName == "+") { + } else if (displayName.isEmpty() || AppUtils.getInitials(displayName) == "+") { val bg = AppCompatResources.getDrawable(context, R.drawable.generated_avatar_bg) imageView.background = bg AppCompatResources.getDrawable(context, R.drawable.icon_single_contact_avatar)