Set LoginActivity and AddServerActivity flag to Intent.FLAG_ACTIVITY_SINGLE_TOP

app/src/main/AndroidManifest.xml

@@ -35,7 +35,8 @@
         <activity
             android:name=".activity.AddServerActivity"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="adjustResize"/>
+            android:windowSoftInputMode="adjustResize"
+            android:launchMode="singleTop"/>
 
         <activity
             android:name=".activity.LoginActivity"

app/src/main/java/chat/rocket/android/LaunchUtil.java

@@ -26,7 +26,7 @@ public class LaunchUtil {
    */
   public static void showAddServerActivity(Context context) {
     Intent intent = new Intent(context, AddServerActivity.class);
-    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
     context.startActivity(intent);
   }
 
@@ -35,7 +35,7 @@ public class LaunchUtil {
    */
   public static void showLoginActivity(Context context, String hostname) {
     Intent intent = new Intent(context, LoginActivity.class);
-    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
     intent.putExtra(LoginActivity.KEY_HOSTNAME, hostname);
     context.startActivity(intent);
   }

app/src/main/java/chat/rocket/android/activity/MainActivity.java

@@ -90,6 +90,7 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
 
   private void showAddServerActivity() {
     Intent intent = new Intent(this, AddServerActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
     intent.putExtra(AddServerActivity.EXTRA_FINISH_ON_BACK_PRESS, true);
     startActivity(intent);
   }