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

Merge pull request #5712 from k9mail/fix_delete_account_crash

Browse source 
Don't crash when trying to load an account that has been removed
This commit is contained in:
cketti 2021-10-04 15:15:20 +02:00 committed by GitHub
commit 6050df0d87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt
View file

@ -4,31 +4,34 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
import com.fsck.k9.Account
import com.fsck.k9.mailstore.FolderRepository
import com.fsck.k9.mailstore.FolderType
import com.fsck.k9.mailstore.RemoteFolder
import com.fsck.k9.mailstore.SpecialFolderSelectionStrategy
import com.fsck.k9.preferences.AccountManager
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class AccountSettingsViewModel(
private val accountManager: AccountManager,
private val folderRepository: FolderRepository,
private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy
private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
) : ViewModel() {
val accounts = accountManager.getAccountsFlow().asLiveData()
private val accountLiveData = MutableLiveData<Account>()
private var accountUuid: String? = null
private val accountLiveData = MutableLiveData<Account?>()
private val foldersLiveData = MutableLiveData<RemoteFolderInfo>()
fun getAccount(accountUuid: String): LiveData<Account> {
if (accountLiveData.value == null) {
GlobalScope.launch(Dispatchers.Main) {
val account = withContext(Dispatchers.IO) {
fun getAccount(accountUuid: String): LiveData<Account?> {
if (this.accountUuid != accountUuid) {
this.accountUuid = accountUuid
viewModelScope.launch {
val account = withContext(backgroundDispatcher) {
loadAccount(accountUuid)
}
accountLiveData.value = account
@ -43,13 +46,16 @@ class AccountSettingsViewModel(
* doesn't support asynchronous preference loading.
*/
fun getAccountBlocking(accountUuid: String): Account {
return accountLiveData.value ?: loadAccount(accountUuid).also {
accountLiveData.value = it
}
return accountLiveData.value
?: loadAccount(accountUuid).also { account ->
this.accountUuid = accountUuid
accountLiveData.value = account
}
?: error("Account $accountUuid not found")
}
private fun loadAccount(accountUuid: String): Account {
return accountManager.getAccount(accountUuid) ?: error("Account $accountUuid not found")
private fun loadAccount(accountUuid: String): Account? {
return accountManager.getAccount(accountUuid)
}
fun getFolders(account: Account): LiveData<RemoteFolderInfo> {
@ -61,8 +67,8 @@ class AccountSettingsViewModel(
}
private fun loadFolders(account: Account) {
GlobalScope.launch(Dispatchers.Main) {
val remoteFolderInfo = withContext(Dispatchers.IO) {
viewModelScope.launch {
val remoteFolderInfo = withContext(backgroundDispatcher) {
val folders = folderRepository.getRemoteFolders(account)
val automaticSpecialFolders = getAutomaticSpecialFolders(folders)
RemoteFolderInfo(folders, automaticSpecialFolders)