Save realm Position on logout so as to save the new realm to that pos…

…ition.
zulip · Apr 18, 2016 · d106288 · d106288
1 parent 1ed4fd2
commit d106288
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/src/main/java/com/zulip/android/ZulipActivity.java b/app/src/main/java/com/zulip/android/ZulipActivity.java
@@ -566,6 +566,9 @@ public void onClick(
                 break;
             case R.id.logout:
                 logout();
+                SharedPreferences.Editor editor = app.settings.edit();
+                editor.putInt("loggedOut", app.currentRealm);
+                editor.apply();
                 break;
             case R.id.legal:
                 openLegal();

diff --git a/app/src/main/java/com/zulip/android/ZulipApp.java b/app/src/main/java/com/zulip/android/ZulipApp.java
@@ -308,7 +308,13 @@ public void setLoggedInApiKeyAndEmail(String apiKey, String email) {
     }
     public void saveServer(String server, String name) {
         SharedPreferences.Editor globalEditor = this.globalSettings.edit();
-        serverStringSet.add(name);
+        int position = settings.getInt("loggedOut", -1);
+        if (position != -1) {
+            serverStringSet.remove(position);
+            serverStringSet.add(position, name);
+        } else {
+            serverStringSet.add(name);
+        }
         globalEditor.putStringSet(GLOBAL_SETTINGS_REALMS, new HashSet<String>(serverStringSet));
         globalEditor.apply();