Finish DevAuthActivity first then finish LoginActivity to login to Zulip Activity

Author: kunall17

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

@@ -25,7 +25,7 @@
 public class DevAuthActivity extends Activity implements LoginInterface {
     private RecyclerView recyclerView;
     private ProgressDialog connectionProgressDialog;
-
+    public static final int ADD_REALM_REQUEST = 566;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

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

@@ -1,5 +1,6 @@
 package com.zulip.android.activities;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -45,6 +46,8 @@
 import java.net.URISyntaxException;
 import java.util.List;
 
+import static com.zulip.android.activities.DevAuthActivity.ADD_REALM_REQUEST;
+
 public class LoginActivity extends AppCompatActivity implements View.OnClickListener,
         GoogleApiClient.OnConnectionFailedListener, LoginInterface {
     private static final String TAG = "LoginActivity";
@@ -61,6 +64,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     private EditText realmNameET;
     private String serverURL;
     private View mGoogleSignInButton;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -122,6 +126,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
                 GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(intent);
                 handleSignInResult(result);
                 break;
+            case ADD_REALM_REQUEST:
+                if (resultCode == Activity.RESULT_OK) {
+                    setResult(Activity.RESULT_OK, intent);
+                    finish();
+                }
             default:
                 break;
         }
@@ -167,7 +176,7 @@ private void checkForError() {
             }
         }
     }
-    
+
 
     private void showBackends(String httpScheme, String serverURL) {
         Uri serverUri = Uri.parse(serverURL);
@@ -415,6 +424,7 @@ public void onTaskFailure(String result) {
                 break;
         }
     }
+
     private boolean isInputValidForDevAuth() {
         boolean isValid = true;
 
@@ -425,13 +435,14 @@ private boolean isInputValidForDevAuth() {
             String serverString = mServerEditText.getText().toString();
             if (!serverString.contains("://")) serverString = "https://" + serverString;
 
-                if (!Patterns.WEB_URL.matcher(serverString).matches()) {
-                    mServerEditText.setError(getString(R.string.invalid_domain));
-                    isValid = false;
-                }
+            if (!Patterns.WEB_URL.matcher(serverString).matches()) {
+                mServerEditText.setError(getString(R.string.invalid_domain));
+                isValid = false;
             }
+        }
         return isValid;
     }
+
     private boolean isInputValid() {
         boolean isValid = true;
 

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

@@ -13,6 +13,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import static com.zulip.android.activities.DevAuthActivity.ADD_REALM_REQUEST;
+
 public class AsyncDevGetEmails extends ZulipAsyncPushTask {
     private static final String DISABLED = "dev_disabled";
     public static final String SERVER_URL_JSON = "server_url";
@@ -47,7 +49,7 @@ protected void onPostExecute(String result) {
                 intent.putExtra(REALM_NAME_JSON, realmName);
                 intent.putExtra(SERVER_URL_JSON, serverURL);
                 intent.putExtra(ADD_REALM_BOOLEAN_JSON, startedFromAddRealm);
-                context.startActivity(intent);
+                ((LoginActivity) context).startActivityForResult(intent, ADD_REALM_REQUEST);
             }
         } catch (JSONException e) {
             ZLog.logException(e);

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

@@ -83,7 +83,14 @@ protected void onPostExecute(String result) {
 
     private void loginThroughAddRealm(JSONObject jsonObject) {
         try {
-            Intent intent = new Intent(context, ZulipActivity.class);
+            Intent intent = null;
+            //This is done to start ZulipActivity from DevAuthActivity which cannot be done directly as DevAuthActivity was called from LoginActivity
+            //And Therefore we have to finish two activities (DevAuthActivity and LoginActivity) if started from DevAuthActivity.
+            if (context instanceof DevAuthActivity) {
+                intent = new Intent();
+            } else if (context instanceof LoginActivity) {
+                intent = new Intent(context, ZulipActivity.class);
+            }
             intent.putExtra("realmName", realmName);
             intent.putExtra("api_key", jsonObject.getString("api_key"));
             intent.putExtra("email", username);