Pass Server URL to HTTPRequest for logging in.

Author: kunall17

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

@@ -54,7 +54,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     private EditText mPassword;
     private EditText serverIn;
     private EditText realmNameET;
-    String serverURL;
+    private String serverURL;
     private View mGoogleSignInButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -172,8 +172,8 @@ private void showBackends(String httpScheme, String serverURL) {
         serverIn.setText(serverUri.toString());
         mServerEditText.setText(serverUri.toString());
         mServerEditText.setEnabled(false);
-        serverURL = serverUri.toString();
-        AsyncGetBackends asyncGetBackends = new AsyncGetBackends(ZulipApp.get(), serverURL);
+        this.serverURL = serverUri.toString();
+        AsyncGetBackends asyncGetBackends = new AsyncGetBackends(ZulipApp.get(), this.serverURL);
         asyncGetBackends.setCallback(new AsyncTaskCompleteListener() {
             @Override
             public void onTaskComplete(String result, JSONObject jsonObject) {

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

@@ -30,6 +30,7 @@ public AsyncDevGetEmails(LoginActivity loginActivity, String serverURL, String r
         this.serverURL = serverURL;
         this.realmName = realmName;
         this.startedFromAddRealm = startedFromAddRealm;
+        this.setServerURL(serverURL);
     }
 
     public final void execute() {

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

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

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

@@ -42,6 +42,7 @@ public AsyncLogin(Activity loginActivity, String username, String password, Stri
         }
         this.setProperty("password", password);
         this.realmName = realmName;
+        this.setServerURL(serverURL);
         this.serverURL = serverURL;
     }
 

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

@@ -32,6 +32,7 @@ public class HTTPRequest {
     private OkHttpClient okHttpClient;
     private Response response = null;
     private String method, path;
+    private String serverURL;
 
     public void setMethodAndUrl(String method, String URL) {
         this.method = method;
@@ -42,8 +43,12 @@ public HTTPRequest(ZulipApp app) {
         properties = new HashMap<>();
         this.app = app;
         okHttpClient = new OkHttpClient.Builder().readTimeout(60, TimeUnit.SECONDS).build();
+        this.serverURL = app.getServerURI();
     }
 
+    public void setServerURL(String serverURL) {
+        this.serverURL = serverURL;
+    }
 
     public void setProperty(String key, String value) {
         properties.put((key == null) ? "" : key, (value == null) ? "" : value);
@@ -70,7 +75,7 @@ public Response execute() throws IOException {
         if (method == null)
             throw new IOException(app.getString(R.string.method_null));
         Request.Builder requestBuilder = new Request.Builder();
-        String url = app.getServerURI() + path;
+        String url = serverURL + path;
         requestBuilder.addHeader("client", "Android");
         requestBuilder.addHeader("User-Agent", app.getUserAgent());
 

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

@@ -23,6 +23,10 @@ public abstract class ZulipAsyncPushTask extends AsyncTask<String, String, Strin
     private HTTPRequest request;
     AsyncTaskCompleteListener callback;
 
+    public void setServerURL(String serverURL) {
+        request.setServerURL(serverURL);
+    }
+
     /**
      * Interface implemented by callbacks which are run at the end of a task.
      * <p/>