Refactoring

app/src/main/java/eu/faircode/email/FragmentIdentity.java

@@ -1187,29 +1187,6 @@ public class FragmentIdentity extends FragmentBase {
 
                 cbPrimary.setEnabled(cbSynchronize.isChecked());
 
-                new SimpleTask<List<EntityAccount>>() {
-                    @Override
-                    protected List<EntityAccount> onExecute(Context context, Bundle args) {
-                        return DB.getInstance(context).account().getAccounts();
-                    }
-
-                    @Override
-                    protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
-                        if (accounts == null)
-                            accounts = new ArrayList<>();
-
-                        EntityAccount unselected = new EntityAccount();
-                        unselected.id = -1L;
-                        unselected.auth_type = EmailService.AUTH_TYPE_PASSWORD;
-                        unselected.name = getString(R.string.title_select);
-                        unselected.primary = false;
-                        accounts.add(0, unselected);
-
-                        ArrayAdapter<EntityAccount> aaAccount =
-                                new ArrayAdapter<>(getContext(), R.layout.spinner_item1, android.R.id.text1, accounts);
-                        aaAccount.setDropDownViewResource(R.layout.spinner_item1_dropdown);
-                        spAccount.setAdapter(aaAccount);
-
                 // Get providers
                 List<EmailProvider> providers = EmailProvider.loadProfiles(getContext());
                 providers.add(0, new EmailProvider(getString(R.string.title_custom)));
@@ -1233,7 +1210,37 @@ public class FragmentIdentity extends FragmentBase {
                                 break;
                             }
                         }
+                } else {
+                    int provider = savedInstanceState.getInt("fair:provider");
+                    spProvider.setTag(provider);
+                    spProvider.setSelection(provider);
+                }
+
+                // Get accounts
+                new SimpleTask<List<EntityAccount>>() {
+                    @Override
+                    protected List<EntityAccount> onExecute(Context context, Bundle args) {
+                        return DB.getInstance(context).account().getAccounts();
+                    }
+
+                    @Override
+                    protected void onExecuted(Bundle args, List<EntityAccount> accounts) {
+                        if (accounts == null)
+                            accounts = new ArrayList<>();
+
+                        EntityAccount unselected = new EntityAccount();
+                        unselected.id = -1L;
+                        unselected.auth_type = EmailService.AUTH_TYPE_PASSWORD;
+                        unselected.name = getString(R.string.title_select);
+                        unselected.primary = false;
+                        accounts.add(0, unselected);
+
+                        ArrayAdapter<EntityAccount> aaAccount =
+                                new ArrayAdapter<>(getContext(), R.layout.spinner_item1, android.R.id.text1, accounts);
+                        aaAccount.setDropDownViewResource(R.layout.spinner_item1_dropdown);
+                        spAccount.setAdapter(aaAccount);
 
+                        if (savedInstanceState == null) {
                             spAccount.setTag(0);
                             spAccount.setSelection(0);
                             for (int pos = 0; pos < accounts.size(); pos++) {
@@ -1246,10 +1253,6 @@ public class FragmentIdentity extends FragmentBase {
                                 }
                             }
                         } else {
-                            int provider = savedInstanceState.getInt("fair:provider");
-                            spProvider.setTag(provider);
-                            spProvider.setSelection(provider);
-
                             int account = savedInstanceState.getInt("fair:account");
                             spAccount.setTag(account);
                             spAccount.setSelection(account);