Merge pull request #2718 from brandonpage/fix-current-user

Switch to new user before sending user switch intent.

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/AuthenticationUtilities.kt

@@ -201,6 +201,8 @@ internal suspend fun onAuthFlowComplete(
 
     // Save the user account
     addAccount(account)
+    userAccountManager.createAccount(account)
+    userAccountManager.switchToUser(account)
 
     // Init user logging
     SalesforceAnalyticsManager.getInstance(account)?.updateLoggingPrefs()
@@ -218,8 +220,6 @@ internal suspend fun onAuthFlowComplete(
         else -> USER_SWITCH_TYPE_DEFAULT
     }
     userAccountManager.sendUserSwitchIntent(userSwitchType, null)
-    userAccountManager.createAccount(account)
-    userAccountManager.switchToUser(account)
 
     // Kickoff the end of the flow before storing mobile policy to prevent launching
     // the main activity over/after the screen lock.