Save the default server URL or the input server URL

Author: niftynei

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

@@ -37,6 +37,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/";
     private Person you;
     private SharedPreferences settings;
     private String api_key;
@@ -152,7 +153,7 @@ public String getServerURI() {
         if (getEmail().equals("[email protected]")) {
             return "http://10.0.2.2:9991/api/";
         }
-        return settings.getString("server_url", "https://api.zulip.com/");
+        return settings.getString("server_url", DEFAULT_SERVER_URL);
     }
     public String getApiKey() {
         return api_key;
@@ -198,6 +199,10 @@ public void setServerURL(String serverURL) {
         ed.apply();
     }
 
+    public void useDefaultServerURL() {
+       setServerURL(DEFAULT_SERVER_URL);
+    }
+
     public void setLoggedInApiKey(String apiKey) {
         this.api_key = apiKey;
         Editor ed = this.settings.edit();

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

@@ -40,6 +40,7 @@ public class LoginActivity extends FragmentActivity implements View.OnClickListe
     private GoogleApiClient mGoogleApiClient;
     private EditText mServerEditText;
     private View mGoogleSignInButton;
+    private CheckBox mUseZulipCheckbox;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,11 +51,13 @@ protected void onCreate(Bundle savedInstanceState) {
         // Progress bar to be displayed if the connection failure is not resolved.
         connectionProgressDialog = new ProgressDialog(this);
         connectionProgressDialog.setMessage(getString(R.string.signing_in));
-        findViewById(R.id.google_sign_in_button).setOnClickListener(this);
-        findViewById(R.id.zulip_login).setOnClickListener(this);
-        ((CheckBox) findViewById(R.id.checkbox_usezulip)).setOnCheckedChangeListener(this);
+
+        mUseZulipCheckbox = ((CheckBox) findViewById(R.id.checkbox_usezulip));
         mServerEditText = (EditText) findViewById(R.id.server_url);
         mGoogleSignInButton = findViewById(R.id.google_sign_in_button);
+        findViewById(R.id.google_sign_in_button).setOnClickListener(this);
+        findViewById(R.id.zulip_login).setOnClickListener(this);
+        mUseZulipCheckbox.setOnCheckedChangeListener(this);
     }
 
     @Override
@@ -85,6 +88,11 @@ protected void onStop() {
     }
 
     private void saveServerURL() {
+        if (mUseZulipCheckbox.isChecked()) {
+            ((ZulipApp) getApplication()).useDefaultServerURL();
+            return;
+        }
+
         String serverURL = mServerEditText.getText().toString();
         int errorMessage = R.string.invalid_server_domain;
 
@@ -217,8 +225,9 @@ public void onClick(View v) {
                 setupGoogleSignIn();
                 break;
             case R.id.zulip_login:
-                connectionProgressDialog.show();
                 saveServerURL();
+                connectionProgressDialog.show();
+                if (!mUseZulipCheckbox.isChecked()) saveServerURL();
                 AsyncLogin alog = new AsyncLogin(LoginActivity.this, ((EditText) findViewById(R.id.username)).getText().toString(),
                         ((EditText) findViewById(R.id.password)).getText().toString());
                 // Remove the CPD when done