Skip to content

fix: App crashes because of AvatarView #1999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2024
Merged

fix: App crashes because of AvatarView #1999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions app/src/main/java/com/infomaniak/mail/views/AvatarView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import com.infomaniak.mail.data.models.correspondent.MergedContact
import com.infomaniak.mail.databinding.ViewAvatarBinding
import com.infomaniak.mail.utils.AccountUtils
import com.infomaniak.mail.utils.Utils
import com.infomaniak.mail.utils.Utils.runCatchingRealm
import com.infomaniak.mail.utils.extensions.MergedContactDictionary
import com.infomaniak.mail.utils.extensions.getColorOrNull
import com.infomaniak.mail.utils.extensions.getTransparentColor
Expand Down Expand Up @@ -71,11 +72,13 @@ class AvatarView @JvmOverloads constructor(
}

private val avatarUpdateObserver = Observer<Pair<MergedContactDictionary, Boolean>> { (contacts, isBimiEnabled) ->
val (correspondent, bimi) = state
val displayType = getAvatarDisplayType(correspondent, bimi, isBimiEnabled)
runCatchingRealm {
val (correspondent, bimi) = state
val displayType = getAvatarDisplayType(correspondent, bimi, isBimiEnabled)

if (displayType == AvatarDisplayType.UNKNOWN_CORRESPONDENT) return@Observer
loadAvatarByDisplayType(displayType, correspondent, bimi, contacts)
if (displayType == AvatarDisplayType.UNKNOWN_CORRESPONDENT) return@Observer
loadAvatarByDisplayType(displayType, correspondent, bimi, contacts)
}
}

@Inject
Expand Down
Loading