Save apikey, server to sharedPreferences while login

Author: kunall17

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -373,6 +373,19 @@ public boolean isTopicMute(int id, String subject) {
         return mutedTopics.contains(id + subject);
     }
 
+    public void saveServerName(String serverName) {
+        String username=null;
+        try {
+            username = you.getEmail();
+        } catch (Exception e) {
+            //SQL Exception can occur if name is not updated!
+            ZLog.logException(e);
+        }
+        Editor globalEditor = this.globalSettings.edit();
+        serverStringSet.add((username != null) ? serverName + " - " + username : serverName);
+        globalEditor.putStringSet(GLOBAL_SETTINGS_REALMS, new HashSet<String>(serverStringSet));
+        globalEditor.apply();
+    }
     public void createNewRealm() {
         SharedPreferences.Editor editor = this.globalSettings.edit();
         currentRealm = serverStringSet.size();

app/src/main/java/com/zulip/android/activities/DevAuthActivity.java

@@ -10,6 +10,8 @@
 import com.zulip.android.R;
 import com.zulip.android.networking.AsyncDevGetEmails;
 import com.zulip.android.networking.AsyncLogin;
+import com.zulip.android.networking.LoginInterface;
+import com.zulip.android.networking.ZulipAsyncPushTask;
 import com.zulip.android.util.AuthClickListener;
 import com.zulip.android.util.ZLog;
 
@@ -20,7 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class DevAuthActivity extends Activity {
+public class DevAuthActivity extends Activity implements LoginInterface {
     private RecyclerView recyclerView;
     private ProgressDialog connectionProgressDialog;
 
@@ -67,6 +69,7 @@ public void onItemClick(String email) {
         });
     }
 
+    @Override
     public void openHome() {
         // Cancel before leaving activity to avoid leaking windows
         connectionProgressDialog.dismiss();

app/src/main/java/com/zulip/android/activities/LoginActivity.java

@@ -27,6 +27,7 @@
 import com.zulip.android.R;
 import com.zulip.android.networking.AsyncDevGetEmails;
 import com.zulip.android.networking.AsyncGetBackends;
+import com.zulip.android.networking.LoginInterface;
 import com.zulip.android.util.AnimationHelper;
 import com.zulip.android.util.ZLog;
 import com.zulip.android.ZulipApp;
@@ -41,7 +42,7 @@
 import java.util.List;
 
 public class LoginActivity extends AppCompatActivity implements View.OnClickListener,
-        GoogleApiClient.OnConnectionFailedListener {
+        GoogleApiClient.OnConnectionFailedListener, LoginInterface {
     private static final String TAG = "LoginActivity";
     private static final int REQUEST_CODE_RESOLVE_ERR = 9000;
     private static final int REQUEST_CODE_SIGN_IN = 9001;
@@ -292,6 +293,7 @@ protected void openLegal() {
         startActivityForResult(i, 0);
     }
 
+    @Override
     public void openHome() {
         // Cancel before leaving activity to avoid leaking windows
         connectionProgressDialog.dismiss();

app/src/main/java/com/zulip/android/networking/AsyncLogin.java

@@ -24,6 +24,7 @@ public class AsyncLogin extends ZulipAsyncPushTask {
     private String realmName;
     private String username;
     private String serverURL;
+    LoginInterface loginInterface;
 
     public AsyncLogin(Activity loginActivity, String username, String password, String realmName, boolean startedFromAddRealm, String serverURL, boolean devServer) {
         super((ZulipApp) loginActivity.getApplication());
@@ -44,6 +45,7 @@ public AsyncLogin(Activity loginActivity, String username, String password, Stri
         this.realmName = realmName;
         this.setServerURL(serverURL);
         this.serverURL = serverURL;
+        loginInterface = (LoginInterface) context;
     }
 
     public final void execute() {
@@ -58,10 +60,15 @@ protected void onPostExecute(String result) {
                 JSONObject obj = new JSONObject(result);
 
                 if (obj.getString("result").equals("success")) {
-                    this.app.setLoggedInApiKey(obj.getString("api_key"));
-                    if (devServer) ((DevAuthActivity) activity).openHome();
-                    else ((LoginActivity) activity).openHome();
-                    callback.onTaskComplete(result, obj);
+                    if (startedFromAddRealm) {
+                        loginThroughAddRealm(obj);
+                        callback.onTaskComplete(result, obj);
+                    } else {
+                        this.app.setServerURL(serverURL);
+                        this.app.setLoggedInApiKey(obj.getString("api_key"));
+                        ZulipApp.get().saveServerName(realmName);
+                        loginInterface.openHome();
+                    }
                     return;
                 }
             } catch (JSONException e) {

app/src/main/java/com/zulip/android/networking/LoginInterface.java

@@ -0,0 +1,6 @@
+package com.zulip.android.networking;
+
+
+public interface LoginInterface {
+    void openHome();
+}