Issue #343 Save the server URL after Logout resolved

Author: harshitagupta30

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

@@ -41,6 +41,7 @@
 import com.zulip.android.networking.response.ZulipBackendResponse;
 import com.zulip.android.networking.util.DefaultCallback;
 import com.zulip.android.util.AnimationHelper;
+import com.zulip.android.util.Constants;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -98,6 +99,10 @@ protected void onCreate(Bundle savedInstanceState) {
         mPassword = (EditText) findViewById(R.id.password);
         mShowPassword = (ImageView) findViewById(R.id.showPassword);
         serverIn = (EditText) findViewById(R.id.server_url_in);
+        String serverUrl = getIntent().getStringExtra(Constants.SERVER_URL);
+        if (serverUrl != null) {
+            serverIn.setText(serverUrl);
+        }
         findViewById(R.id.server_btn).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -102,6 +102,7 @@
 import com.zulip.android.networking.ZulipAsyncPushTask;
 import com.zulip.android.networking.response.UploadResponse;
 import com.zulip.android.util.AnimationHelper;
+import com.zulip.android.util.Constants;
 import com.zulip.android.util.FilePathHelper;
 import com.zulip.android.util.MutedTopics;
 import com.zulip.android.util.RemoveViewsOnScroll;
@@ -321,7 +322,7 @@ protected void onCreate(Bundle savedInstanceState) {
         processParams();
 
         if (!app.isLoggedIn()) {
-            openLogin();
+            openLogin(null);
             return;
         }
 
@@ -2120,20 +2121,22 @@ private void setNightMode(@AppCompatDelegate.NightMode int nightMode) {
      */
     private void logout() {
         this.logged_in = false;
+        final String serverUrl = app.getServerURI();
 
         notifications.logOut(new Runnable() {
             public void run() {
                 app.logOut();
-                openLogin();
+                openLogin(serverUrl);
             }
         });
     }
 
     /**
      * Switch to the login view.
      */
-    private void openLogin() {
+    private void openLogin(String serverUrl) {
         Intent i = new Intent(this, LoginActivity.class);
+        i.putExtra(Constants.SERVER_URL, serverUrl);
         startActivity(i);
         finish();
     }

app/src/main/java/com/zulip/android/util/Constants.java

@@ -13,5 +13,6 @@ public class Constants {
     //Default maximum time limit for editing message(Same as server)
     public final static int DEFAULT_MAXIMUM_CONTENT_EDIT_LIMIT = 600;
     public final static boolean DEFAULT_EDITING_ALLOWED = true;
+    public final static String SERVER_URL = "SERVER_URL";
 
 }