From fdc3e164e40b55a422e839f12ca063034360650d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 20 May 2019 16:43:35 +0200
Subject: [PATCH] Fixed issue in generic login + fixed crash when deleting an
 account

---
 .../assistant/GenericConnectionAssistantActivity.java    | 9 ---------
 .../org/linphone/settings/AccountSettingsFragment.java   | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java b/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
index 4f8acf1b4..28f2f951d 100644
--- a/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/GenericConnectionAssistantActivity.java
@@ -27,19 +27,14 @@ import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
-import org.linphone.LinphoneManager;
 import org.linphone.R;
-import org.linphone.core.AccountCreator;
 import org.linphone.core.TransportType;
-import org.linphone.settings.LinphonePreferences;
 
 public class GenericConnectionAssistantActivity extends AssistantActivity implements TextWatcher {
     private TextView mLogin;
     private EditText mUsername, mPassword, mDomain, mDisplayName;
     private RadioGroup mTransport;
 
-    private AccountCreator mAccountCreator;
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,10 +63,6 @@ public class GenericConnectionAssistantActivity extends AssistantActivity implem
         mDomain = findViewById(R.id.assistant_domain);
         mDomain.addTextChangedListener(this);
         mTransport = findViewById(R.id.assistant_transports);
-
-        mAccountCreator =
-                LinphoneManager.getCore()
-                        .createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
     }
 
     private void configureAccount() {
diff --git a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
index a87318a6d..a7cba5a3a 100644
--- a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
@@ -537,10 +537,10 @@ public class AccountSettingsFragment extends SettingsFragment {
                                 core.removeAuthInfo(mAuthInfo);
                             }
                         }
-                        ((SettingsActivity) getActivity()).popBackStack();
                         ((SettingsActivity) getActivity())
                                 .getSideMenuFragment()
                                 .displayAccountsInSideMenu();
+                        ((SettingsActivity) getActivity()).popBackStack();
                     }
                 });