Merge pull request #14888 from wordpress-mobile/issue/14632-logout-me-fragment

Me View: Fix logout behavior

Author: zwarm

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -1280,7 +1280,15 @@ public static void showMainActivityAndSiteCreationActivity(Activity activity) {
     }
 
     public static void showSignInForResult(Activity activity) {
+        showSignInForResult(activity, false);
+    }
+
+    public static void showSignInForResult(Activity activity, boolean clearTop) {
         Intent intent = new Intent(activity, LoginActivity.class);
+        if (clearTop) {
+            intent.setFlags(
+                    Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        }
         activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
     }
 

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -1403,7 +1403,7 @@ private void handleSiteRemoved() {
             if (BuildConfig.IS_JETPACK_APP) {
                 ActivityLauncher.showSignInForResultJetpackOnly(this);
             } else {
-                ActivityLauncher.showSignInForResult(this);
+                ActivityLauncher.showSignInForResult(this, true);
             }
         } else {
             SiteModel site = getSelectedSite();