Save realmName, serverUrl in asynLogin

Author: kunall17

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

@@ -30,6 +30,9 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_dev_auth);
         String json = getIntent().getStringExtra(AsyncDevGetEmails.EMAIL_JSON);
+        final String realmName = getIntent().getStringExtra(AsyncDevGetEmails.REALM_NAME_JSON);
+        final String serverURL = getIntent().getStringExtra(AsyncDevGetEmails.SERVER_URL_JSON);
+        final boolean startedFromAddRealm = getIntent().getBooleanExtra(AsyncDevGetEmails.ADD_REALM_BOOLEAN_JSON, false);
         recyclerView = (RecyclerView) findViewById(R.id.devAuthRecyclerView);
         List<String> emails = new ArrayList<>();
         int directAdminSize = 1;
@@ -55,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
         authEmailAdapter.setOnItemClickListener(new AuthClickListener() {
             @Override
             public void onItemClick(String email) {
-                AsyncLogin asyncLogin = new AsyncLogin(DevAuthActivity.this, email, null, true);
+                AsyncLogin asyncLogin = new AsyncLogin(DevAuthActivity.this, email, null, realmName, startedFromAddRealm, serverURL, true);
                 asyncLogin.execute();
                 connectionProgressDialog.show();
             }

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

@@ -9,6 +9,7 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
@@ -34,6 +35,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 
 public class LoginActivity extends AppCompatActivity implements View.OnClickListener,
@@ -42,14 +45,15 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     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;
     private EditText mUserName;
     private EditText mPassword;
     private EditText serverIn;
     private EditText realmNameET;
-
+    String serverURL;
     private View mGoogleSignInButton;
 
     @Override
@@ -153,6 +157,7 @@ private void checkForError() {
             }
         }
     }
+    
 
     private void showBackends(String httpScheme, String serverURL) {
         Uri serverUri = Uri.parse(serverURL);
@@ -167,8 +172,8 @@ private void showBackends(String httpScheme, String serverURL) {
         serverIn.setText(serverUri.toString());
         mServerEditText.setText(serverUri.toString());
         mServerEditText.setEnabled(false);
-        ((ZulipApp) getApplication()).setServerURL(serverUri.toString());
-        AsyncGetBackends asyncGetBackends = new AsyncGetBackends(ZulipApp.get());
+        serverURL = serverUri.toString();
+        AsyncGetBackends asyncGetBackends = new AsyncGetBackends(ZulipApp.get(), serverURL);
         asyncGetBackends.setCallback(new AsyncTaskCompleteListener() {
             @Override
             public void onTaskComplete(String result, JSONObject jsonObject) {
@@ -240,7 +245,7 @@ private void handleSignInResult(GoogleSignInResult result) {
                 return;
             }
 
-            final AsyncLogin loginTask = new AsyncLogin(LoginActivity.this, "google-oauth2-token", account.getIdToken(), false);
+            final AsyncLogin loginTask = new AsyncLogin(LoginActivity.this, "google-oauth2-token", account.getIdToken(), getRealmName(), startedFromAddRealm, serverURL, false);
             loginTask.setCallback(new AsyncTaskCompleteListener() {
                 @Override
                 public void onTaskComplete(String result, JSONObject object) {
@@ -268,7 +273,21 @@ public void onTaskFailure(String result) {
         }
     }
 
-    private void openLegal() {
+    private String getRealmName() {
+        if (TextUtils.isEmpty(realmNameET.getText())) {
+            String server = serverURL;
+            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);
     }
@@ -339,10 +358,14 @@ public void onClick(View v) {
                 if (!isInputValid()) {
                     return;
                 }
+                if (!isInputValid()) return;
+                if (serverURL == null) return;
                 connectionProgressDialog.show();
 
                 AsyncLogin alog = new AsyncLogin(LoginActivity.this,
-                        mUserName.getText().toString(), mPassword.getText().toString(), false);
+                        mUserName.getText().toString(), mPassword.getText().toString(),
+                        getRealmName(), startedFromAddRealm, serverURL, false);
+
                 // Remove the CPD when done
                 alog.setCallback(new AsyncTaskCompleteListener() {
                     @Override
@@ -364,7 +387,7 @@ public void onTaskFailure(String result) {
             case R.id.local_server_button:
                 if (!isInputValidForDevAuth()) return;
                 connectionProgressDialog.show();
-                AsyncDevGetEmails asyncDevGetEmails = new AsyncDevGetEmails(LoginActivity.this);
+                AsyncDevGetEmails asyncDevGetEmails = new AsyncDevGetEmails(LoginActivity.this, serverURL, getRealmName(), startedFromAddRealm);
                 asyncDevGetEmails.setCallback(new AsyncTaskCompleteListener() {
                     @Override
                     public void onTaskComplete(String result, JSONObject jsonObject) {

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

@@ -16,11 +16,20 @@
 public class AsyncDevGetEmails extends ZulipAsyncPushTask {
     private static final String DISABLED = "dev_disabled";
     private Context context;
+    public static final String SERVER_URL_JSON = "server_url";
+    public static final String REALM_NAME_JSON = "realm_json";
+    public static final String ADD_REALM_BOOLEAN_JSON = "add_realm_bool_json";
     public final static String EMAIL_JSON = "emails_json";
+    private String serverURL;
+    private String realmName;
+    private boolean startedFromAddRealm;
 
-    public AsyncDevGetEmails(LoginActivity loginActivity) {
+    public AsyncDevGetEmails(LoginActivity loginActivity, String serverURL, String realmName, boolean startedFromAddRealm) {
         super((ZulipApp) loginActivity.getApplication());
         context = loginActivity;
+        this.serverURL = serverURL;
+        this.realmName = realmName;
+        this.startedFromAddRealm = startedFromAddRealm;
     }
 
     public final void execute() {
@@ -34,6 +43,9 @@ protected void onPostExecute(String result) {
             if (obj.getString("result").equals("success")) {
                 Intent intent = new Intent(context, DevAuthActivity.class);
                 intent.putExtra(EMAIL_JSON, result);
+                intent.putExtra(REALM_NAME_JSON, realmName);
+                intent.putExtra(SERVER_URL_JSON, serverURL);
+                intent.putExtra(ADD_REALM_BOOLEAN_JSON, startedFromAddRealm);
                 context.startActivity(intent);
             }
         } catch (JSONException e) {

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

@@ -4,8 +4,11 @@
 
 public class AsyncGetBackends extends ZulipAsyncPushTask {
 
-    public AsyncGetBackends(ZulipApp app) {
+    private String serverURL;
+
+    public AsyncGetBackends(ZulipApp app, String url) {
         super(app);
+        this.serverURL = url;
     }
 
     //Json Format - {"msg":"","password":false,"google":false,"result":"success","dev":true}

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

@@ -18,13 +18,19 @@ public class AsyncLogin extends ZulipAsyncPushTask {
 
     private Activity activity;
     private boolean devServer = true; //If this is a DevAuthBackend server!
-    private LoginActivity context;
+    private Activity context;
     private boolean userDefinitelyInvalid = false;
+    boolean startedFromAddRealm = false;
+    private String realmName;
+    private String username;
+    private String serverURL;
 
-    public AsyncLogin(Activity activity, String username, String password, boolean devServer) {
-        super(ZulipApp.get());
-        this.activity = activity;
-        if (username.contains("@")) {
+    public AsyncLogin(Activity loginActivity, String username, String password, String realmName, boolean startedFromAddRealm, String serverURL, boolean devServer) {
+        super((ZulipApp) loginActivity.getApplication());
+        this.startedFromAddRealm = startedFromAddRealm;
+        context = loginActivity;
+        this.username = username;
+        if (username.contains("@") && !startedFromAddRealm) {
             // @-less usernames are used as indicating special cases, for
             // example in OAuth2 authentication
             this.app.setEmail(username);
@@ -34,6 +40,9 @@ public AsyncLogin(Activity activity, String username, String password, boolean d
             this.setProperty("password", password);
             this.devServer = false;
         }
+        this.setProperty("password", password);
+        this.realmName = realmName;
+        this.serverURL = serverURL;
     }
 
     public final void execute() {

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

@@ -81,7 +81,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>