From c8f2fd34af3f7ca9eb3f890bb56ed0eb82e1a056 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 5 May 2021 17:05:51 +0200
Subject: [PATCH] Fixed crash & wrong registration status when deleting default
 account

---
 .../activities/main/sidemenu/viewmodels/SideMenuViewModel.kt  | 1 +
 .../linphone/activities/main/viewmodels/StatusViewModel.kt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
index 2703aab62..db3a5cd10 100644
--- a/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/sidemenu/viewmodels/SideMenuViewModel.kt
@@ -76,6 +76,7 @@ class SideMenuViewModel : ViewModel() {
     }
 
     fun updateAccountsList() {
+        defaultAccountFound.value = false // Do not assume a default account will still be found
         val list = arrayListOf<AccountSettingsViewModel>()
         if (coreContext.core.accountList.isNotEmpty()) {
             val defaultAccount = coreContext.core.defaultAccount
diff --git a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
index e27f3b456..a6d0404a7 100644
--- a/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/viewmodels/StatusViewModel.kt
@@ -43,6 +43,10 @@ open class StatusViewModel : ViewModel() {
         ) {
             if (account == core.defaultAccount) {
                 updateDefaultAccountRegistrationStatus(state)
+            } else if (core.accountList.isEmpty()) {
+                // Update registration status when default account is removed
+                registrationStatusText.value = getStatusIconText(state)
+                registrationStatusDrawable.value = getStatusIconResource(state)
             }
         }