Check the login mode before exiting when already logged in (#21695)

wordpress-mobile · Feb 21, 2025 · ae20186 · ae20186
1 parent 90d5e86
commit ae20186
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
@@ -156,7 +156,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         // when displaying that screen
         mLoginHelper.bindCustomTabsService(this);
 
-        if (mLoginHelper.isLoggedIn()) {
+        // go no further if the user is already logged in and this is the login screen shown at startup
+        //      FULL = WPAndroid
+        //      JETPACK_LOGIN_ONLY = JPAndroid
+        LoginMode loginMode = getLoginMode();
+        if ((mLoginHelper.isLoggedIn()) && (loginMode == LoginMode.FULL || loginMode == LoginMode.JETPACK_LOGIN_ONLY)) {
             this.loggedInAndFinish(new ArrayList<Integer>(), true);
             return;
         }
@@ -173,7 +177,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
             mLoginAnalyticsListener.trackLoginAccessed();
 
-            switch (getLoginMode()) {
+            switch (loginMode) {
                 case FULL:
                 case JETPACK_LOGIN_ONLY:
                     mUnifiedLoginTracker.setSource(Source.DEFAULT);