wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid crash when getting flow for non-existent account

Browse source
This commit is contained in:
cketti 2021-09-29 23:47:34 +02:00
parent 3caaa4f470
commit 84eca27d4f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/core/src/main/java/com/fsck/k9/Preferences.kt
View file

@ -115,8 +115,13 @@ class Preferences internal constructor(
@OptIn(ExperimentalCoroutinesApi::class)
override fun getAccountFlow(accountUuid: String): Flow<Account> {
return callbackFlow<Account> {
val initialAccount = getAccount(accountUuid) ?: return@callbackFlow
return callbackFlow {
val initialAccount = getAccount(accountUuid)
if (initialAccount == null) {
close()
return@callbackFlow
}
send(initialAccount)
val listener = AccountsChangeListener {
@ -124,7 +129,7 @@ class Preferences internal constructor(
if (account != null) {
sendBlockingSilently(account)
} else {
channel.close()
close()
}
}
addOnAccountsChangeListener(listener)