Skip to content

Commit

Permalink
chore: Use existing loadAvatar method instead of loadUserAvatar
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyDL-Infomaniak committed Feb 21, 2025
1 parent f9f42b4 commit cbc142a
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions app/src/main/java/com/infomaniak/mail/views/AvatarView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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!!)
Expand Down Expand Up @@ -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!!)
Expand Down

0 comments on commit cbc142a

Please sign in to comment.