From cbc142ac8a9eb0adeefe6b32f7a4a475216f749f Mon Sep 17 00:00:00 2001 From: TommyDL-Infomaniak Date: Fri, 21 Feb 2025 10:39:08 +0100 Subject: [PATCH] chore: Use existing loadAvatar method instead of loadUserAvatar --- app/src/main/java/com/infomaniak/mail/views/AvatarView.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/views/AvatarView.kt b/app/src/main/java/com/infomaniak/mail/views/AvatarView.kt index 1b21dbcd67..914d6f2085 100644 --- a/app/src/main/java/com/infomaniak/mail/views/AvatarView.kt +++ b/app/src/main/java/com/infomaniak/mail/views/AvatarView.kt @@ -196,7 +196,7 @@ class AvatarView @JvmOverloads constructor( ) { when (avatarDisplayType) { AvatarDisplayType.UNKNOWN_CORRESPONDENT -> loadUnknownUserAvatar() - AvatarDisplayType.USER_AVATAR -> loadUserAvatar(correspondent!!, bimi) + AvatarDisplayType.USER_AVATAR -> AccountUtils.currentUser?.let { loadAvatar(user = it) } AvatarDisplayType.CUSTOM_AVATAR, AvatarDisplayType.INITIALS -> loadAvatarUsingDictionary(correspondent!!, contacts, bimi) AvatarDisplayType.BIMI -> loadBimiAvatar(correspondent!!, bimi!!) @@ -230,11 +230,6 @@ class AvatarView @JvmOverloads constructor( binding.avatarImage.baseLoadAvatar(correspondent = mergedContact ?: correspondent) } - private fun loadUserAvatar(correspondent: Correspondent, bimi: Bimi?) { - state.update(correspondent, bimi) - binding.avatarImage.baseLoadAvatar(correspondent) - } - private fun ImageView.baseLoadAvatar(correspondent: Correspondent) { if (correspondent.shouldDisplayUserAvatar()) { this@AvatarView.loadAvatar(AccountUtils.currentUser!!)