Save realmName, serverUrl in asynLogin

Author: kunall17

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

@@ -39,7 +39,7 @@ public class ZulipApp extends Application {
     public static final String EMAIL = "email";
     private static ZulipApp instance;
     private static final String USER_AGENT = "ZulipMobile";
-    private static final String DEFAULT_SERVER_URL = "https://api.zulip.com/";
+    public static final String DEFAULT_SERVER_URL = "https://api.zulip.com/";
     private Person you;
     private SharedPreferences settings;
     private String api_key;

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

@@ -6,6 +6,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
@@ -30,13 +31,16 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 
 public class LoginActivity extends FragmentActivity implements View.OnClickListener,
         GoogleApiClient.OnConnectionFailedListener, CompoundButton.OnCheckedChangeListener {
     private static final int REQUEST_CODE_RESOLVE_ERR = 9000;
     private static final int REQUEST_CODE_SIGN_IN = 9001;
 
+    private boolean startedFromAddRealm = false;
     private ProgressDialog connectionProgressDialog;
     private GoogleApiClient mGoogleApiClient;
     private EditText mServerEditText;
@@ -45,6 +49,7 @@ public class LoginActivity extends FragmentActivity implements View.OnClickListe
     private View mGoogleSignInButton;
     private CheckBox mUseZulipCheckbox;
     private EditText realmNameET;
+    String serverURL;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -96,10 +101,14 @@ protected void onStop() {
         super.onStop();
     }
 
-    private void saveServerURL() {
+    private String getServerURL() {
+        if (ZulipApp.get().serverStringSet.contains(realmNameET.getText().toString())) {
+            Toast.makeText(LoginActivity.this, R.string.realm_exists, Toast.LENGTH_SHORT).show();
+            return null;
+        }
+
         if (mUseZulipCheckbox.isChecked()) {
-            ((ZulipApp) getApplication()).useDefaultServerURL();
-            return;
+            return ZulipApp.DEFAULT_SERVER_URL;
         }
 
         String serverURL = mServerEditText.getText().toString();
@@ -125,8 +134,8 @@ private void saveServerURL() {
             serverUri = serverUri.buildUpon().appendPath("api").build();
         }
 
-        ((ZulipApp) getApplication()).setServerURL(serverUri.toString());
         Toast.makeText(this, getString(R.string.logging_into_server, serverUri.toString()), Toast.LENGTH_SHORT).show();
+        return serverUri.toString();
     }
 
 
@@ -142,7 +151,7 @@ private void handleSignInResult(GoogleSignInResult result) {
                 return;
             }
 
-            final AsyncLogin loginTask = new AsyncLogin(LoginActivity.this, "google-oauth2-token", account.getIdToken());
+            final AsyncLogin loginTask = new AsyncLogin(LoginActivity.this, "google-oauth2-token", account.getIdToken(), getRealmName(), startedFromAddRealm, serverURL);
             loginTask.setCallback(new AsyncTaskCompleteListener() {
                 @Override
                 public void onTaskComplete(String result, JSONObject object) {
@@ -170,6 +179,20 @@ public void onTaskFailure(String result) {
         }
     }
 
+    private String getRealmName() {
+        if (TextUtils.isEmpty(realmNameET.getText())) {
+            String server = ZulipApp.get().getServerURI();
+            URI uri = null;
+            try {
+                uri = new URI(server);
+            } catch (URISyntaxException e) {
+                return server;
+            }
+            return uri.getHost();
+        }
+        return realmNameET.getText().toString();
+    }
+
     protected void openLegal() {
         Intent i = new Intent(this, LegalActivity.class);
         startActivityForResult(i, 0);
@@ -234,16 +257,20 @@ public void onClick(View v) {
         switch (v.getId()) {
             case R.id.google_sign_in_button:
                 connectionProgressDialog.show();
-                saveServerURL();
+                serverURL = getServerURL();
+                if (serverURL == null) return;
                 setupGoogleSignIn();
                 break;
             case R.id.zulip_login:
                 if (!isInputValid()) return;
-                saveServerURL();
+                serverURL = getServerURL();
+                if (serverURL == null) return;
                 connectionProgressDialog.show();
 
                 AsyncLogin alog = new AsyncLogin(LoginActivity.this,
-                        mUserName.getText().toString(), mPassword.getText().toString());
+                        mUserName.getText().toString(), mPassword.getText().toString(),
+                        getRealmName(), startedFromAddRealm, serverURL);
+
                 // Remove the CPD when done
                 alog.setCallback(new AsyncTaskCompleteListener() {
                     @Override

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

@@ -16,19 +16,27 @@ public class AsyncLogin extends ZulipAsyncPushTask {
     public static final String UNREGISTERED = "unregistered";
     public static final String DISABLED = "disabled";
 
+    boolean startedFromAddRealm = false;
     LoginActivity context;
     boolean userDefinitelyInvalid = false;
+    private String realmName;
+    private String username;
+    private String serverURL;
 
-    public AsyncLogin(LoginActivity loginActivity, String username, String password) {
+    public AsyncLogin(LoginActivity loginActivity, String username, String password, String realmName, boolean startedFromAddRealm, String serverURL) {
         super((ZulipApp) loginActivity.getApplication());
+        this.startedFromAddRealm = startedFromAddRealm;
         context = loginActivity;
-        if (username.contains("@")) {
+        this.username = username;
+        if (username.contains("@") && !startedFromAddRealm) {
             // @-less usernames are used as indicating special cases, for
             // example in OAuth2 authentication
             this.app.setEmail(username);
         }
         this.setProperty("username", username);
         this.setProperty("password", password);
+        this.realmName = realmName;
+        this.serverURL = serverURL;
     }
 
     public final void execute() {

app/src/main/res/values/strings.xml

@@ -71,7 +71,6 @@
     <string name="please_wait">Please wait</string>
     <string name="realm_add">Add Realm</string>
     <string name="realm_name">Name of a realm (Optional)</string>
-
-
+    <string name="realm_exists">Realm Name already exists, please change.</string>
 
 </resources>