Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash & wrong registration status when deleting default account

Browse source
This commit is contained in:
Sylvain Berfini 2021-05-05 17:05:51 +02:00
parent 8b417fe436
commit c8f2fd34af
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
View file

@ -76,6 +76,7 @@ class SideMenuViewModel : ViewModel() {
} }
fun updateAccountsList() { fun updateAccountsList() {
defaultAccountFound.value = false // Do not assume a default account will still be found
val list = arrayListOf<AccountSettingsViewModel>() val list = arrayListOf<AccountSettingsViewModel>()
if (coreContext.core.accountList.isNotEmpty()) { if (coreContext.core.accountList.isNotEmpty()) {
val defaultAccount = coreContext.core.defaultAccount val defaultAccount = coreContext.core.defaultAccount

4
app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
View file

@ -43,6 +43,10 @@ open class StatusViewModel : ViewModel() {
) { ) {
if (account == core.defaultAccount) { if (account == core.defaultAccount) {
updateDefaultAccountRegistrationStatus(state) updateDefaultAccountRegistrationStatus(state)
} else if (core.accountList.isEmpty()) {
// Update registration status when default account is removed
registrationStatusText.value = getStatusIconText(state)
registrationStatusDrawable.value = getStatusIconResource(state)
} }
} }