@W-16336722: [MSDK Android] QR Code Log In Using External QR Code Reader Does Not Display Main Activity (#2625)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt

@@ -215,6 +215,18 @@ open class SalesforceSDKManager protected constructor(
      */
     val loginActivityClass: Class<out Activity> = nativeLoginActivity ?: webviewLoginActivityClass
 
+    /**
+     * For Salesforce Identity API UI Bridge support, the overriding front door bridge URL to
+     * use in place of the default initial login URL
+     */
+    var frontDoorBridgeUrl: String? = null
+
+    /**
+     * For Salesforce Identity API UI Bridge support, the overriding front door bridge URL's
+     * optional web server flow code verifier
+     */
+    var frontDoorBridgeCodeVerifier: String? = null
+
     /** The class for the account switcher activity */
     var accountSwitcherActivityClass = AccountSwitcherActivity::class.java
 
@@ -951,6 +963,9 @@ open class SalesforceSDKManager protected constructor(
 
         val accountToLogout = account ?: clientMgr.account
 
+        frontDoorBridgeUrl = null
+        frontDoorBridgeCodeVerifier = null
+
         isLoggingOut = true
         val mgr = AccountManager.get(appContext)
         var refreshToken: String? = null

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ClientManager.java

@@ -103,7 +103,7 @@ public void getRestClient(Activity activityContext, RestClientCallback restClien
         Account acc = getAccount();
         Bundle options = loginOptions.asBundle();
 
-        // No account found - let's add one - the AuthenticatorService add account method will start the login activity
+        // No account found - let's add one - the AuthenticatorService add account method will start the login activity using either the default login URL or the Salesforce SDK manager's front door URL for Salesforce Identity API UI Bridge
         if (acc == null) {
             SalesforceSDKLogger.i(TAG, "No account of type " + accountType + " found");
             final Intent i = new Intent(activityContext,