From b67b91d95a029c24d4b4cb0ba6ada7e57c20f191 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 20 Jul 2020 11:03:23 +0200
Subject: [PATCH] Fixed removal of proxy config not done if matching auth info
 wasn't found

---
 .../main/settings/viewmodels/AccountSettingsViewModel.kt  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index 492579629..c872486cb 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -139,10 +139,14 @@ class AccountSettingsViewModel(val proxyConfig: ProxyConfig) : GenericSettingsVi
     private fun deleteProxyConfig(cfg: ProxyConfig) {
         val authInfo = cfg.findAuthInfo()
         if (authInfo != null) {
-            core.removeProxyConfig(cfg)
+            Log.i("[Account Settings] Found auth info $authInfo, removing it.")
             core.removeAuthInfo(authInfo)
-            proxyConfigRemovedEvent.value = Event(true)
+        } else {
+            Log.w("[Account Settings] Couldn't find matching auth info...")
         }
+
+        core.removeProxyConfig(cfg)
+        proxyConfigRemovedEvent.value = Event(true)
     }
 
     val deleteListener = object : SettingListenerStub() {