From a66d57dc4d382ed7470f1c54389fc088954f2a85 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 13 Nov 2019 10:31:13 +0100
Subject: [PATCH] Fixed registration status after removing account

---
 .../linphone/fragments/StatusBarFragment.java    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/fragments/StatusBarFragment.java b/app/src/main/java/org/linphone/fragments/StatusBarFragment.java
index 27f31d648..9c7e53bb6 100644
--- a/app/src/main/java/org/linphone/fragments/StatusBarFragment.java
+++ b/app/src/main/java/org/linphone/fragments/StatusBarFragment.java
@@ -79,10 +79,8 @@ public class StatusBarFragment extends Fragment {
                             final RegistrationState state,
                             String smessage) {
                         if (core.getProxyConfigList() == null) {
-                            mStatusLed.setImageResource(R.drawable.led_disconnected);
-                            mStatusText.setText(getString(R.string.no_account));
-                        } else {
-                            mStatusLed.setVisibility(View.VISIBLE);
+                            showNoAccountConfigured();
+                            return;
                         }
 
                         if ((core.getDefaultProxyConfig() != null
@@ -152,6 +150,8 @@ public class StatusBarFragment extends Fragment {
             ProxyConfig lpc = core.getDefaultProxyConfig();
             if (lpc != null) {
                 mListener.onRegistrationStateChanged(core, lpc, lpc.getState(), null);
+            } else {
+                showNoAccountConfigured();
             }
         } else {
             mStatusText.setVisibility(View.VISIBLE);
@@ -178,12 +178,16 @@ public class StatusBarFragment extends Fragment {
             mVoicemailCount.setVisibility(View.VISIBLE);
 
             if (core.getProxyConfigList().length == 0) {
-                mStatusLed.setImageResource(R.drawable.led_disconnected);
-                mStatusText.setText(getString(R.string.no_account));
+                showNoAccountConfigured();
             }
         }
     }
 
+    private void showNoAccountConfigured() {
+        mStatusLed.setImageResource(R.drawable.led_disconnected);
+        mStatusText.setText(getString(R.string.no_account));
+    }
+
     private int getStatusIconResource(RegistrationState state) {
         try {
             if (state == RegistrationState.Ok) {