From ba16f74a39f55b7633b09e0462998a845f08eff2 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Fri, 31 May 2024 16:44:43 -0700
Subject: [PATCH 01/17] (WIP) login with QR button in login screen For now
 launches QR code reader and print url to log

---
 libs/SalesforceSDK/AndroidManifest.xml        |  2 ++
 libs/SalesforceSDK/build.gradle.kts           |  2 ++
 libs/SalesforceSDK/res/layout/sf__login.xml   | 15 +++++++++++++++
 libs/SalesforceSDK/res/values/sf__strings.xml |  1 +
 4 files changed, 20 insertions(+)

diff --git a/libs/SalesforceSDK/AndroidManifest.xml b/libs/SalesforceSDK/AndroidManifest.xml
index 25650f150a..730e2e2631 100644
--- a/libs/SalesforceSDK/AndroidManifest.xml
+++ b/libs/SalesforceSDK/AndroidManifest.xml
@@ -18,6 +18,8 @@
     <!-- USE_BIOMETRIC is available on API 28 and higher -->
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
 
+    <uses-permission android:name="android.permission.CAMERA"/>
+
     <application>
 
         <!-- Metadata for supported app restrictions -->
diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts
index 02623bd30b..86c8eeebbf 100644
--- a/libs/SalesforceSDK/build.gradle.kts
+++ b/libs/SalesforceSDK/build.gradle.kts
@@ -25,6 +25,8 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
     implementation("androidx.window:window:1.3.0")
     implementation("androidx.window:window-core:1.3.0")
+    implementation("com.google.zxing:core:3.4.1")
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0")
     androidTestImplementation("androidx.test:runner:1.6.0")
     androidTestImplementation("androidx.test:rules:1.6.0")
     androidTestImplementation("androidx.test.ext:junit:1.2.0")
diff --git a/libs/SalesforceSDK/res/layout/sf__login.xml b/libs/SalesforceSDK/res/layout/sf__login.xml
index 9cd8336667..430c226315 100644
--- a/libs/SalesforceSDK/res/layout/sf__login.xml
+++ b/libs/SalesforceSDK/res/layout/sf__login.xml
@@ -55,5 +55,20 @@
             android:textAllCaps="false"
             android:textSize="14sp"
             android:textStyle="bold"/>
+
+        <Button android:id="@+id/sf__qr_login_button"
+            android:text="@string/sf__login_with_qr"
+            android:visibility="gone"
+            android:onClick="onQRLoginClick"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/sf__primary_color_button"
+            android:textColor="?attr/sfColorSecondary"
+            android:textAllCaps="false"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/libs/SalesforceSDK/res/values/sf__strings.xml b/libs/SalesforceSDK/res/values/sf__strings.xml
index 04806780c1..b613dc44d4 100644
--- a/libs/SalesforceSDK/res/values/sf__strings.xml
+++ b/libs/SalesforceSDK/res/values/sf__strings.xml
@@ -27,6 +27,7 @@
 	<string name="sf__launch_idp">Log In with IDP App</string>
 	<string name="sf__login_with_biometric">Log In with Biometric</string>
 	<string name="sf__setup_biometric_unlock">Setup Biometric Unlock</string>
+	<string name="sf__login_with_qr">Log In with QR</string>
 
 	<!-- Server picker -->
 	<string name="sf__auth_login_production">Production</string>

From fb4baeff7b51fd6020e14966b774a4285de8e87f Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Wed, 5 Jun 2024 17:09:44 -0700
Subject: [PATCH 02/17] Parsing bridge url and pkce code verifier from url read
 from QR

---
 .../androidsdk/app/SalesforceSDKManager.kt    |  3 +
 .../salesforce/androidsdk/ui/LoginActivity.kt | 85 +++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
index b36b420bc4..6a63bd8c0f 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
@@ -258,6 +258,9 @@ open class SalesforceSDKManager protected constructor(
             field = value
         }
 
+    @set:Synchronized
+    open var isQRLoginFlowEnabled = false
+
     /** Indicates if logout is in progress */
     var isLoggingOut = false
         private set
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 1b732cdcdd..cb2158c983 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -46,6 +46,7 @@ import android.os.Bundle
 import android.provider.Settings.ACTION_BIOMETRIC_ENROLL
 import android.provider.Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED
 import android.security.KeyChain.choosePrivateKeyAlias
+import android.util.Log
 import android.view.KeyEvent
 import android.view.KeyEvent.KEYCODE_BACK
 import android.view.Menu
@@ -59,6 +60,9 @@ import android.widget.Button
 import android.widget.Toast.LENGTH_SHORT
 import android.widget.Toast.makeText
 import android.window.OnBackInvokedDispatcher.PRIORITY_DEFAULT
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
@@ -78,12 +82,16 @@ import androidx.biometric.BiometricPrompt.PromptInfo
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getMainExecutor
 import androidx.core.content.ContextCompat.registerReceiver
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanIntentResult
+import com.journeyapps.barcodescanner.ScanOptions
 import com.salesforce.androidsdk.R.id.sf__bio_login_button
 import com.salesforce.androidsdk.R.id.sf__idp_login_button
 import com.salesforce.androidsdk.R.id.sf__menu_clear_cookies
 import com.salesforce.androidsdk.R.id.sf__menu_pick_server
 import com.salesforce.androidsdk.R.id.sf__menu_reload
 import com.salesforce.androidsdk.R.id.sf__oauth_webview
+import com.salesforce.androidsdk.R.id.sf__qr_login_button
 import com.salesforce.androidsdk.R.string.sf__biometric_opt_in_title
 import com.salesforce.androidsdk.R.string.sf__login_with_biometric
 import com.salesforce.androidsdk.R.string.sf__screen_lock_error
@@ -116,9 +124,13 @@ import com.salesforce.androidsdk.util.UriFragmentParser.parse
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
+import org.json.JSONObject
+import java.net.URL
+import java.net.URLDecoder
 import com.salesforce.androidsdk.R.layout.sf__login as sf__login_layout
 import com.salesforce.androidsdk.R.menu.sf__login as sf__login_menu
 
+
 /**
  * Login activity authenticates a user. Authorization happens inside a web view.
  * Once an authorization code is obtained, it is exchanged for access and
@@ -144,6 +156,8 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
     private var biometricAuthenticationButton: Button? = null
 
+    private var qrReaderLauncher: ActivityResultLauncher<Intent>? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -175,10 +189,16 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         // Setup content view
         setContentView(sf__login_layout)
+
         if (salesforceSDKManager.isIDPLoginFlowEnabled) {
             findViewById<Button>(sf__idp_login_button).visibility = VISIBLE
         }
 
+        if (salesforceSDKManager.isQRLoginFlowEnabled) {
+            findViewById<Button>(sf__qr_login_button).visibility = VISIBLE
+            prepareQRReader()
+        }
+
         val biometricAuthenticationManager = (salesforceSDKManager.biometricAuthenticationManager as? BiometricAuthenticationManager)
         if (biometricAuthenticationManager?.locked == true && biometricAuthenticationManager.hasBiometricOptedIn()) {
             if (biometricAuthenticationManager.isNativeBiometricLoginButtonEnabled()) {
@@ -547,6 +567,70 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
 
+    internal fun prepareQRReader() {
+        qrReaderLauncher = registerForActivityResult<Intent, ActivityResult>(
+            ActivityResultContracts.StartActivityForResult()
+        ) { resultData: ActivityResult ->
+            if (resultData.resultCode == RESULT_OK) {
+
+                val result = ScanIntentResult.parseActivityResult(
+                    resultData.resultCode,
+                    resultData.data
+                )
+
+                if (result.contents != null) {
+                    val qrContents = result.contents
+                    Log.i(TAG, "qrContents-->" + qrContents)
+                    parseQRContents(qrContents)
+                }
+                else {
+                    // TBD
+                }
+            }
+        }
+    }
+    internal fun presentQRReader() {
+        qrReaderLauncher?.launch(ScanContract().createIntent(this, ScanOptions()));
+    }
+
+    data class BridgeInfo(
+        val frontdoorBridgeUrl: String,
+        val pkceCodeVerifier: String
+    )
+
+    internal fun parseQRContents(contents: String): BridgeInfo? {
+        val queryParams = getQueryParams(contents)
+        val bridgeJsonEncoded = queryParams["bridgeJson"]
+        if (bridgeJsonEncoded != null) {
+            val bridgeJsonDecoded = URLDecoder.decode(bridgeJsonEncoded, "UTF-8")
+            return parseBridgeInfo(bridgeJsonDecoded)
+        } else {
+            return null
+        }
+    }
+
+    internal fun getQueryParams(urlString: String): Map<String, String> {
+        val query = urlString.substringAfter("?", "")
+        return query.split("&")
+            .map { it.split("=") }
+            .associate {
+                val key = URLDecoder.decode(it[0], "UTF-8")
+                val value = URLDecoder.decode(it[1], "UTF-8")
+                key to value
+            }
+    }
+
+    fun parseBridgeInfo(jsonString: String): BridgeInfo {
+        val jsonObject = JSONObject(jsonString)
+        val frontdoorBridgeUrl = jsonObject.getString("frontdoor_bridge_url")
+        val pkceCodeVerifier = jsonObject.getString("pkce_code_verifier")
+        Log.i(TAG, "frontdoot_bridge_url-->" + frontdoorBridgeUrl)
+        Log.i(TAG,"pkce_code_verifier-->" + pkceCodeVerifier)
+        return BridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
+    }
+
+    open fun onQRLoginClick(view: View?) = presentQRReader()
+
     internal fun presentBiometric() {
         val biometricPrompt = biometricPrompt
         val biometricManager = BiometricManager.from(this)
@@ -660,3 +744,4 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         private const val TAG = "LoginActivity"
     }
 }
+

From 9a0a352a59896944825c9eccd38bafac0cb7e509 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Wed, 5 Jun 2024 17:11:54 -0700
Subject: [PATCH 03/17] Enabling QR login in Rest Explorer

---
 .../RestExplorer/res/values/bootconfig.xml                | 7 +++++--
 native/NativeSampleApps/RestExplorer/res/xml/servers.xml  | 1 +
 .../salesforce/samples/restexplorer/RestExplorerApp.java  | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
index 984faeb549..083bd77214 100644
--- a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
+++ b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
+    <string name="oauthRedirectURI">mobilesdk://android/pn/tester</string>
+    <string name="remoteAccessConsumerKey">3MVG9.AgwtoIvERSd8i8lePrqfnKG_MM7P9KAJ4g53iaPA4EN8zUt3__o.8YA_hCeRn_kGR.Xe9I9_pnsFuAW</string>
+
     <!-- Mobile SDK Sample App (cs1.mobilesdk.ee.org) -->
-    <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>
-    <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>
+<!--    <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>-->
+<!--    <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>-->
     <string-array name="oauthScopes">
         <item>api</item>
         <item>web</item>
diff --git a/native/NativeSampleApps/RestExplorer/res/xml/servers.xml b/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
index 9504626121..173b561b66 100644
--- a/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
+++ b/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <servers>
+    <server name="SDB 6" url="https://mobilesdkatsdb6.test1.my.pc-rnd.salesforce.com/"/>
     <server name="Sandbox" url="https://test.salesforce.com" />
     <server name="SDK Production" url="https://mobilesdk.my.salesforce.com" />
 </servers>
diff --git a/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java b/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
index 5bdc24f8a1..79f57d1e2d 100644
--- a/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
+++ b/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
@@ -63,7 +63,13 @@ public void onCreate() {
          * Replace 'com.salesforce.samples.salesforceandroididptemplateapp' with the package name
          * of the IDP app meant to be used.
          */
-         SalesforceSDKManager.getInstance().setIDPAppPackageName("com.salesforce.samples.salesforceandroididptemplateapp");
+		// SalesforceSDKManager.getInstance().setIDPAppPackageName("com.salesforce.samples.salesforceandroididptemplateapp");
+
+		/*
+		 * Uncomment the following line enable QR login flow. This will allow the user to
+		 * login by scanning a QR code.
+		 */
+		SalesforceSDKManager.getInstance().setQRLoginFlowEnabled(true);
 
 		/*
 		 * Un-comment the line below to enable push notifications in this app.

From 4396670bb52b7aa8ef18b7a5f11df3060149b48b Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Wed, 5 Jun 2024 17:38:16 -0700
Subject: [PATCH 04/17] Loading frontdoor bridge url in web view (wip)

---
 .../src/com/salesforce/androidsdk/ui/LoginActivity.kt      | 7 ++++++-
 .../src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index cb2158c983..8c23ef2639 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -581,7 +581,12 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
                 if (result.contents != null) {
                     val qrContents = result.contents
                     Log.i(TAG, "qrContents-->" + qrContents)
-                    parseQRContents(qrContents)
+                    parseQRContents(qrContents)?.let {
+                        webviewHelper?.loginWithFrontdoorBridgeUrl(
+                            it.frontdoorBridgeUrl,
+                            it.pkceCodeVerifier
+                        )
+                    }
                 }
                 else {
                     // TBD
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index 7466fb02d0..6589907bee 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -1399,6 +1399,11 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
         }
     }
 
+    fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
+        codeVerifier = pkceCodeVerifier
+        webView?.loadUrl(frontdoorBridgeUrl)
+    }
+
     companion object {
 
         /**

From ca4d874b88ec4761654699e8a80f53b00ed07929 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Wed, 5 Jun 2024 17:38:41 -0700
Subject: [PATCH 05/17] Adding custom scheme handler for login qr

---
 .../NativeSampleApps/RestExplorer/AndroidManifest.xml  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
index c553f8d572..f9808d9a1b 100644
--- a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
+++ b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
@@ -55,6 +55,16 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
+			<!-- Login with QR -->
+			<intent-filter>
+				<data android:scheme="restexplorer"
+					android:host="*"
+					android:path="/login/qr" />
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<category android:name="android.intent.category.DEFAULT" />
+			</intent-filter>
         </activity>
 
 	</application>

From edf8c6a75c1e44d8460399316c5cb11eea347e70 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Thu, 6 Jun 2024 17:04:13 -0700
Subject: [PATCH 06/17] Handling custom scheme (wip)

---
 .../salesforce/androidsdk/ui/LoginActivity.kt | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 8c23ef2639..85dc6d843e 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -26,6 +26,8 @@
  */
 package com.salesforce.androidsdk.ui
 
+import android.R.attr.action
+import android.R.attr.data
 import android.accounts.AccountAuthenticatorResponse
 import android.accounts.AccountManager.ERROR_CODE_CANCELED
 import android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
@@ -125,7 +127,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.json.JSONObject
-import java.net.URL
 import java.net.URLDecoder
 import com.salesforce.androidsdk.R.layout.sf__login as sf__login_layout
 import com.salesforce.androidsdk.R.menu.sf__login as sf__login_menu
@@ -257,6 +258,13 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         requestedOrientation = if (salesforceSDKManager.compactScreen(this))
             ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else
             ActivityInfo.SCREEN_ORIENTATION_FULL_USER
+
+        if (intent.action == Intent.ACTION_VIEW
+            && intent.data != null
+            && intent.data?.path == "/login/qr") {
+
+            loginFromQR("?${intent.data?.query}")
+        }
     }
 
     override fun onDestroy() {
@@ -581,12 +589,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
                 if (result.contents != null) {
                     val qrContents = result.contents
                     Log.i(TAG, "qrContents-->" + qrContents)
-                    parseQRContents(qrContents)?.let {
-                        webviewHelper?.loginWithFrontdoorBridgeUrl(
-                            it.frontdoorBridgeUrl,
-                            it.pkceCodeVerifier
-                        )
-                    }
+                    loginFromQR(qrContents)
                 }
                 else {
                     // TBD
@@ -595,7 +598,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
     internal fun presentQRReader() {
-        qrReaderLauncher?.launch(ScanContract().createIntent(this, ScanOptions()));
+         qrReaderLauncher?.launch(ScanContract().createIntent(this, ScanOptions()));
     }
 
     data class BridgeInfo(
@@ -625,7 +628,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             }
     }
 
-    fun parseBridgeInfo(jsonString: String): BridgeInfo {
+    internal fun parseBridgeInfo(jsonString: String): BridgeInfo {
         val jsonObject = JSONObject(jsonString)
         val frontdoorBridgeUrl = jsonObject.getString("frontdoor_bridge_url")
         val pkceCodeVerifier = jsonObject.getString("pkce_code_verifier")
@@ -636,6 +639,15 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
     open fun onQRLoginClick(view: View?) = presentQRReader()
 
+    fun loginFromQR(qrContents: String) {
+        parseQRContents(qrContents)?.let {
+            webviewHelper?.loginWithFrontdoorBridgeUrl(
+                it.frontdoorBridgeUrl,
+                it.pkceCodeVerifier
+            )
+        }
+    }
+
     internal fun presentBiometric() {
         val biometricPrompt = biometricPrompt
         val biometricManager = BiometricManager.from(this)

From 3c9c0584472f5cc8bd8a10de0d5a61f01af58959 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Thu, 6 Jun 2024 18:04:53 -0700
Subject: [PATCH 07/17] Moving QR support code our of Mobile SDK (to template)

---
 libs/SalesforceSDK/AndroidManifest.xml        |   2 -
 libs/SalesforceSDK/build.gradle.kts           |   2 -
 libs/SalesforceSDK/res/layout/sf__login.xml   |  14 ---
 libs/SalesforceSDK/res/values/sf__strings.xml |   1 -
 .../salesforce/androidsdk/ui/LoginActivity.kt | 109 +++++++-----------
 .../RestExplorer/AndroidManifest.xml          |   9 --
 .../RestExplorer/res/values/bootconfig.xml    |   7 +-
 .../RestExplorer/res/xml/servers.xml          |   1 -
 8 files changed, 44 insertions(+), 101 deletions(-)

diff --git a/libs/SalesforceSDK/AndroidManifest.xml b/libs/SalesforceSDK/AndroidManifest.xml
index 730e2e2631..25650f150a 100644
--- a/libs/SalesforceSDK/AndroidManifest.xml
+++ b/libs/SalesforceSDK/AndroidManifest.xml
@@ -18,8 +18,6 @@
     <!-- USE_BIOMETRIC is available on API 28 and higher -->
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
 
-    <uses-permission android:name="android.permission.CAMERA"/>
-
     <application>
 
         <!-- Metadata for supported app restrictions -->
diff --git a/libs/SalesforceSDK/build.gradle.kts b/libs/SalesforceSDK/build.gradle.kts
index 86c8eeebbf..02623bd30b 100644
--- a/libs/SalesforceSDK/build.gradle.kts
+++ b/libs/SalesforceSDK/build.gradle.kts
@@ -25,8 +25,6 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
     implementation("androidx.window:window:1.3.0")
     implementation("androidx.window:window-core:1.3.0")
-    implementation("com.google.zxing:core:3.4.1")
-    implementation("com.journeyapps:zxing-android-embedded:4.3.0")
     androidTestImplementation("androidx.test:runner:1.6.0")
     androidTestImplementation("androidx.test:rules:1.6.0")
     androidTestImplementation("androidx.test.ext:junit:1.2.0")
diff --git a/libs/SalesforceSDK/res/layout/sf__login.xml b/libs/SalesforceSDK/res/layout/sf__login.xml
index 430c226315..d9ae78b222 100644
--- a/libs/SalesforceSDK/res/layout/sf__login.xml
+++ b/libs/SalesforceSDK/res/layout/sf__login.xml
@@ -56,19 +56,5 @@
             android:textSize="14sp"
             android:textStyle="bold"/>
 
-        <Button android:id="@+id/sf__qr_login_button"
-            android:text="@string/sf__login_with_qr"
-            android:visibility="gone"
-            android:onClick="onQRLoginClick"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginBottom="20dp"
-            android:background="@drawable/sf__primary_color_button"
-            android:textColor="?attr/sfColorSecondary"
-            android:textAllCaps="false"
-            android:textSize="14sp"
-            android:textStyle="bold"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/libs/SalesforceSDK/res/values/sf__strings.xml b/libs/SalesforceSDK/res/values/sf__strings.xml
index b613dc44d4..04806780c1 100644
--- a/libs/SalesforceSDK/res/values/sf__strings.xml
+++ b/libs/SalesforceSDK/res/values/sf__strings.xml
@@ -27,7 +27,6 @@
 	<string name="sf__launch_idp">Log In with IDP App</string>
 	<string name="sf__login_with_biometric">Log In with Biometric</string>
 	<string name="sf__setup_biometric_unlock">Setup Biometric Unlock</string>
-	<string name="sf__login_with_qr">Log In with QR</string>
 
 	<!-- Server picker -->
 	<string name="sf__auth_login_production">Production</string>
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 85dc6d843e..8b65e972f2 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -26,8 +26,6 @@
  */
 package com.salesforce.androidsdk.ui
 
-import android.R.attr.action
-import android.R.attr.data
 import android.accounts.AccountAuthenticatorResponse
 import android.accounts.AccountManager.ERROR_CODE_CANCELED
 import android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
@@ -48,7 +46,6 @@ import android.os.Bundle
 import android.provider.Settings.ACTION_BIOMETRIC_ENROLL
 import android.provider.Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED
 import android.security.KeyChain.choosePrivateKeyAlias
-import android.util.Log
 import android.view.KeyEvent
 import android.view.KeyEvent.KEYCODE_BACK
 import android.view.Menu
@@ -62,9 +59,6 @@ import android.widget.Button
 import android.widget.Toast.LENGTH_SHORT
 import android.widget.Toast.makeText
 import android.window.OnBackInvokedDispatcher.PRIORITY_DEFAULT
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
@@ -84,16 +78,12 @@ import androidx.biometric.BiometricPrompt.PromptInfo
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getMainExecutor
 import androidx.core.content.ContextCompat.registerReceiver
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanIntentResult
-import com.journeyapps.barcodescanner.ScanOptions
 import com.salesforce.androidsdk.R.id.sf__bio_login_button
 import com.salesforce.androidsdk.R.id.sf__idp_login_button
 import com.salesforce.androidsdk.R.id.sf__menu_clear_cookies
 import com.salesforce.androidsdk.R.id.sf__menu_pick_server
 import com.salesforce.androidsdk.R.id.sf__menu_reload
 import com.salesforce.androidsdk.R.id.sf__oauth_webview
-import com.salesforce.androidsdk.R.id.sf__qr_login_button
 import com.salesforce.androidsdk.R.string.sf__biometric_opt_in_title
 import com.salesforce.androidsdk.R.string.sf__login_with_biometric
 import com.salesforce.androidsdk.R.string.sf__screen_lock_error
@@ -157,8 +147,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
     private var biometricAuthenticationButton: Button? = null
 
-    private var qrReaderLauncher: ActivityResultLauncher<Intent>? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -195,11 +183,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             findViewById<Button>(sf__idp_login_button).visibility = VISIBLE
         }
 
-        if (salesforceSDKManager.isQRLoginFlowEnabled) {
-            findViewById<Button>(sf__qr_login_button).visibility = VISIBLE
-            prepareQRReader()
-        }
-
         val biometricAuthenticationManager = (salesforceSDKManager.biometricAuthenticationManager as? BiometricAuthenticationManager)
         if (biometricAuthenticationManager?.locked == true && biometricAuthenticationManager.hasBiometricOptedIn()) {
             if (biometricAuthenticationManager.isNativeBiometricLoginButtonEnabled()) {
@@ -259,11 +242,13 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else
             ActivityInfo.SCREEN_ORIENTATION_FULL_USER
 
-        if (intent.action == Intent.ACTION_VIEW
-            && intent.data != null
-            && intent.data?.path == "/login/qr") {
+        // QR login
+        if (salesforceSDKManager.isQRLoginFlowEnabled) {
+            if ((intent.action == Intent.ACTION_VIEW)
+                && intent.data?.path?.contains(LOGIN_QR_PATH) == true) {
+                loginFromQR(intent.data?.query)
+            }
 
-            loginFromQR("?${intent.data?.query}")
         }
     }
 
@@ -575,50 +560,24 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
 
-    internal fun prepareQRReader() {
-        qrReaderLauncher = registerForActivityResult<Intent, ActivityResult>(
-            ActivityResultContracts.StartActivityForResult()
-        ) { resultData: ActivityResult ->
-            if (resultData.resultCode == RESULT_OK) {
-
-                val result = ScanIntentResult.parseActivityResult(
-                    resultData.resultCode,
-                    resultData.data
-                )
-
-                if (result.contents != null) {
-                    val qrContents = result.contents
-                    Log.i(TAG, "qrContents-->" + qrContents)
-                    loginFromQR(qrContents)
-                }
-                else {
-                    // TBD
-                }
-            }
-        }
-    }
-    internal fun presentQRReader() {
-         qrReaderLauncher?.launch(ScanContract().createIntent(this, ScanOptions()));
-    }
-
-    data class BridgeInfo(
+    private data class BridgeInfo(
         val frontdoorBridgeUrl: String,
         val pkceCodeVerifier: String
     )
 
-    internal fun parseQRContents(contents: String): BridgeInfo? {
-        val queryParams = getQueryParams(contents)
-        val bridgeJsonEncoded = queryParams["bridgeJson"]
-        if (bridgeJsonEncoded != null) {
-            val bridgeJsonDecoded = URLDecoder.decode(bridgeJsonEncoded, "UTF-8")
-            return parseBridgeInfo(bridgeJsonDecoded)
-        } else {
-            return null
+    private fun parseQRContents(contents: String?): BridgeInfo? {
+        if (contents != null) {
+            val bridgeJsonEncoded = getQueryParams(contents)[BRIDGE_JSON_PARAM]
+            if (bridgeJsonEncoded != null) {
+                val bridgeJsonDecoded = URLDecoder.decode(bridgeJsonEncoded, "UTF-8")
+                return parseBridgeInfo(bridgeJsonDecoded)
+            }
         }
+        return null
     }
 
-    internal fun getQueryParams(urlString: String): Map<String, String> {
-        val query = urlString.substringAfter("?", "")
+    private fun getQueryParams(urlOrQueryString: String): Map<String, String> {
+        val query = urlOrQueryString.substringAfter("?", urlOrQueryString /* if we are just given the query */)
         return query.split("&")
             .map { it.split("=") }
             .associate {
@@ -628,26 +587,37 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             }
     }
 
-    internal fun parseBridgeInfo(jsonString: String): BridgeInfo {
+    private fun parseBridgeInfo(jsonString: String): BridgeInfo {
         val jsonObject = JSONObject(jsonString)
-        val frontdoorBridgeUrl = jsonObject.getString("frontdoor_bridge_url")
-        val pkceCodeVerifier = jsonObject.getString("pkce_code_verifier")
-        Log.i(TAG, "frontdoot_bridge_url-->" + frontdoorBridgeUrl)
-        Log.i(TAG,"pkce_code_verifier-->" + pkceCodeVerifier)
+        val frontdoorBridgeUrl = jsonObject.getString(FRONTDOOR_BRIDGE_URL_KEY)
+        val pkceCodeVerifier = jsonObject.getString(PKCE_CODE_VERIFIER_KEY)
         return BridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
     }
 
-    open fun onQRLoginClick(view: View?) = presentQRReader()
-
-    fun loginFromQR(qrContents: String) {
+    /**
+     * Login with qr contents
+     * @param qrContents a url or url query containing a bridgeJson parameter
+     *      bridgeJson parameter should contain a url-encoded JSON with two values: frontdoor_bridge_url and pkce_code_verifier
+     * NB: does nothing if qrContents is null or bridgeJson parameter is not found
+     */
+    fun loginFromQR(qrContents: String?) {
         parseQRContents(qrContents)?.let {
-            webviewHelper?.loginWithFrontdoorBridgeUrl(
+            loginWithFrontdoorBridgeUrl(
                 it.frontdoorBridgeUrl,
                 it.pkceCodeVerifier
             )
         }
     }
 
+    /**
+     * Login with a frontdoor bridge url and PKCE code verifier
+     * @param frontdoorBridgeUrl
+     * @param pkceCodeVerifier
+     */
+    fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
+        webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
+    }
+
     internal fun presentBiometric() {
         val biometricPrompt = biometricPrompt
         val biometricManager = BiometricManager.from(this)
@@ -759,6 +729,11 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         const val PICK_SERVER_REQUEST_CODE = 10
         private const val SETUP_REQUEST_CODE = 72
         private const val TAG = "LoginActivity"
+
+        const val LOGIN_QR_PATH = "/login/qr"
+        const val BRIDGE_JSON_PARAM = "bridgeJson"
+        const val FRONTDOOR_BRIDGE_URL_KEY = "frontdoor_bridge_url"
+        const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
     }
 }
 
diff --git a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
index f9808d9a1b..c9df45348c 100644
--- a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
+++ b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
@@ -56,15 +56,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
-			<!-- Login with QR -->
-			<intent-filter>
-				<data android:scheme="restexplorer"
-					android:host="*"
-					android:path="/login/qr" />
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<category android:name="android.intent.category.DEFAULT" />
-			</intent-filter>
         </activity>
 
 	</application>
diff --git a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
index 083bd77214..984faeb549 100644
--- a/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
+++ b/native/NativeSampleApps/RestExplorer/res/values/bootconfig.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="oauthRedirectURI">mobilesdk://android/pn/tester</string>
-    <string name="remoteAccessConsumerKey">3MVG9.AgwtoIvERSd8i8lePrqfnKG_MM7P9KAJ4g53iaPA4EN8zUt3__o.8YA_hCeRn_kGR.Xe9I9_pnsFuAW</string>
-
     <!-- Mobile SDK Sample App (cs1.mobilesdk.ee.org) -->
-<!--    <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>-->
-<!--    <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>-->
+    <string name="remoteAccessConsumerKey">3MVG98dostKihXN53TYStBIiS8FC2a3tE3XhGId0hQ37iQjF0xe4fxMSb2mFaWZn9e3GiLs1q67TNlyRji.Xw</string>
+    <string name="oauthRedirectURI">testsfdc:///mobilesdk/detect/oauth/done</string>
     <string-array name="oauthScopes">
         <item>api</item>
         <item>web</item>
diff --git a/native/NativeSampleApps/RestExplorer/res/xml/servers.xml b/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
index 173b561b66..9504626121 100644
--- a/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
+++ b/native/NativeSampleApps/RestExplorer/res/xml/servers.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <servers>
-    <server name="SDB 6" url="https://mobilesdkatsdb6.test1.my.pc-rnd.salesforce.com/"/>
     <server name="Sandbox" url="https://test.salesforce.com" />
     <server name="SDK Production" url="https://mobilesdk.my.salesforce.com" />
 </servers>

From 4bb050cf617ac0125f00ff8596a50cb814f839c0 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Thu, 6 Jun 2024 20:21:29 -0700
Subject: [PATCH 08/17] During QR login, do no load anything in the web view
 and don't get auth config

---
 .../salesforce/androidsdk/ui/LoginActivity.kt | 80 +++++++++++--------
 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 8b65e972f2..2c820167b5 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -117,7 +117,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.json.JSONObject
-import java.net.URLDecoder
 import com.salesforce.androidsdk.R.layout.sf__login as sf__login_layout
 import com.salesforce.androidsdk.R.menu.sf__login as sf__login_menu
 
@@ -152,6 +151,8 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         val salesforceSDKManager = SalesforceSDKManager.getInstance()
 
+        val isQRLogin = isQRLogin(intent)
+
         accountAuthenticatorResponse = intent.getParcelableExtra<AccountAuthenticatorResponse?>(
             KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
         )?.apply {
@@ -167,14 +168,21 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         salesforceSDKManager.setViewNavigationVisibility(this)
 
-        // Get login options from the intent's extras
-        val loginOptions = fromBundleWithSafeLoginUrl(intent.extras)
+        val loginOptions = if (isQRLogin) {
+            // Get app login options
+            salesforceSDKManager.loginOptions
+        } else {
+            // Get login options from the intent's extras
+            fromBundleWithSafeLoginUrl(intent.extras)
+        }
 
         // Protect against screenshots
         window.setFlags(FLAG_SECURE, FLAG_SECURE)
 
         // Fetch authentication configuration if required
-        salesforceSDKManager.fetchAuthenticationConfiguration()
+        if (!isQRLogin) {
+            salesforceSDKManager.fetchAuthenticationConfiguration()
+        }
 
         // Setup content view
         setContentView(sf__login_layout)
@@ -218,7 +226,14 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             LoginActivityCreateComplete,
             this
         )
-        certAuthOrLogin()
+
+        // QR login
+        if (isQRLogin) {
+            loginFromQR("?" + intent.data?.query)
+        } else {
+            certAuthOrLogin()
+        }
+
         if (!receiverRegistered) {
             authConfigReceiver = AuthConfigReceiver().also { changeServerReceiver ->
                 registerReceiver(
@@ -241,15 +256,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         requestedOrientation = if (salesforceSDKManager.compactScreen(this))
             ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else
             ActivityInfo.SCREEN_ORIENTATION_FULL_USER
-
-        // QR login
-        if (salesforceSDKManager.isQRLoginFlowEnabled) {
-            if ((intent.action == Intent.ACTION_VIEW)
-                && intent.data?.path?.contains(LOGIN_QR_PATH) == true) {
-                loginFromQR(intent.data?.query)
-            }
-
-        }
     }
 
     override fun onDestroy() {
@@ -560,31 +566,34 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
 
+    private fun isQRLogin(intent: Intent): Boolean {
+        return SalesforceSDKManager.getInstance().isQRLoginFlowEnabled
+            && intent.data?.path?.contains(LOGIN_QR_PATH) == true
+    }
+
     private data class BridgeInfo(
         val frontdoorBridgeUrl: String,
         val pkceCodeVerifier: String
     )
 
-    private fun parseQRContents(contents: String?): BridgeInfo? {
-        if (contents != null) {
-            val bridgeJsonEncoded = getQueryParams(contents)[BRIDGE_JSON_PARAM]
-            if (bridgeJsonEncoded != null) {
-                val bridgeJsonDecoded = URLDecoder.decode(bridgeJsonEncoded, "UTF-8")
-                return parseBridgeInfo(bridgeJsonDecoded)
+    private fun parseQRContents(qrContents: String?): BridgeInfo? {
+        if (qrContents != null) {
+            d(TAG, "qrContents-->${qrContents}")
+            val bridgeJsonString = extractBridgeJsonParam(qrContents)
+            d(TAG, "bridgeJsonString-->${bridgeJsonString}")
+            if (bridgeJsonString != null) {
+                val bridgeInfo = parseBridgeInfo(bridgeJsonString)
+                d(TAG, "bridgeInfo-->${bridgeInfo}")
+                return bridgeInfo
             }
         }
         return null
     }
 
-    private fun getQueryParams(urlOrQueryString: String): Map<String, String> {
-        val query = urlOrQueryString.substringAfter("?", urlOrQueryString /* if we are just given the query */)
-        return query.split("&")
-            .map { it.split("=") }
-            .associate {
-                val key = URLDecoder.decode(it[0], "UTF-8")
-                val value = URLDecoder.decode(it[1], "UTF-8")
-                key to value
-            }
+    private fun extractBridgeJsonParam(qrContents: String): String? {
+        val regex = """\?bridgeJson=(\{.*\})""".toRegex()
+        val matchResult = regex.find(qrContents)
+        return matchResult?.groups?.get(1)?.value
     }
 
     private fun parseBridgeInfo(jsonString: String): BridgeInfo {
@@ -598,15 +607,18 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
      * Login with qr contents
      * @param qrContents a url or url query containing a bridgeJson parameter
      *      bridgeJson parameter should contain a url-encoded JSON with two values: frontdoor_bridge_url and pkce_code_verifier
-     * NB: does nothing if qrContents is null or bridgeJson parameter is not found
+     * @return true if a frontdoor bridge url could be extracted from qrContents
      */
-    fun loginFromQR(qrContents: String?) {
-        parseQRContents(qrContents)?.let {
+    fun loginFromQR(qrContents: String?): Boolean {
+        val bridgeInfo = parseQRContents(qrContents)
+        if (bridgeInfo != null) {
             loginWithFrontdoorBridgeUrl(
-                it.frontdoorBridgeUrl,
-                it.pkceCodeVerifier
+                bridgeInfo.frontdoorBridgeUrl,
+                bridgeInfo.pkceCodeVerifier
             )
+            return true
         }
+        return false
     }
 
     /**

From 43e03d9986c5ac583b3b858be0d4241b934477d4 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Thu, 6 Jun 2024 20:31:33 -0700
Subject: [PATCH 09/17] Handling url encoded bridgeJson

---
 .../com/salesforce/androidsdk/ui/LoginActivity.kt    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 2c820167b5..e1f7ba17cf 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -117,6 +117,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.json.JSONObject
+import java.net.URLDecoder
 import com.salesforce.androidsdk.R.layout.sf__login as sf__login_layout
 import com.salesforce.androidsdk.R.menu.sf__login as sf__login_menu
 
@@ -591,9 +592,14 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
     }
 
     private fun extractBridgeJsonParam(qrContents: String): String? {
-        val regex = """\?bridgeJson=(\{.*\})""".toRegex()
-        val matchResult = regex.find(qrContents)
-        return matchResult?.groups?.get(1)?.value
+        // Coming from intent (external QR reader) we have ?bridgeJson={...}
+        // Coming from embedded QR reader we have ?bridgeJson=%7B...%7D
+        val regexExternal = """\?bridgeJson=(\{.*\})""".toRegex()
+        val regexInternal = """\?bridgeJson=(%7B.*%7D)""".toRegex()
+        return regexExternal.find(qrContents)?.groups?.get(1)?.value
+            ?: regexInternal.find(qrContents)?.groups?.get(1)?.value?.let {
+                URLDecoder.decode(it, "UTF-8")
+            }
     }
 
     private fun parseBridgeInfo(jsonString: String): BridgeInfo {

From e2bbfec0af13758aba4c0391cb30b578ac008ea7 Mon Sep 17 00:00:00 2001
From: Wolfgang Mathurin <wmathurin@salesforce.com>
Date: Fri, 7 Jun 2024 17:10:48 -0700
Subject: [PATCH 10/17] Extracting login url from front door bridge url Using
 user agent flow if no pkce code verifier provided

---
 .../src/com/salesforce/androidsdk/ui/LoginActivity.kt        | 3 ++-
 .../src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index e1f7ba17cf..82a6eda909 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -605,7 +605,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
     private fun parseBridgeInfo(jsonString: String): BridgeInfo {
         val jsonObject = JSONObject(jsonString)
         val frontdoorBridgeUrl = jsonObject.getString(FRONTDOOR_BRIDGE_URL_KEY)
-        val pkceCodeVerifier = jsonObject.getString(PKCE_CODE_VERIFIER_KEY)
+        val pkceCodeVerifier = jsonObject.optString(PKCE_CODE_VERIFIER_KEY, "")
         return BridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
     }
 
@@ -613,6 +613,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
      * Login with qr contents
      * @param qrContents a url or url query containing a bridgeJson parameter
      *      bridgeJson parameter should contain a url-encoded JSON with two values: frontdoor_bridge_url and pkce_code_verifier
+     *      if not pkce_code_verifier is specified we use user agent flow
      * @return true if a frontdoor bridge url could be extracted from qrContents
      */
     fun loginFromQR(qrContents: String?): Boolean {
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index 6589907bee..3453d74465 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -661,7 +661,7 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
                     )
 
                     else -> when {
-                        instance.useWebServerAuthentication -> onWebServerFlowComplete(params["code"])
+                        codeVerifier?.isNotEmpty() == true -> onWebServerFlowComplete(params["code"])
                         else -> onAuthFlowComplete(TokenEndpointResponse(params))
                     }
                 }
@@ -1400,6 +1400,9 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
     }
 
     fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
+        val uri = URI(frontdoorBridgeUrl)
+        loginOptions.loginUrl = "${uri.scheme}://${uri.host}"
+        d(TAG, "loginUrl-->${loginOptions.loginUrl}")
         codeVerifier = pkceCodeVerifier
         webView?.loadUrl(frontdoorBridgeUrl)
     }

From 7d28d9df019ac6e29fb0a084715525c265906de1 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Thu, 18 Jul 2024 14:02:53 -0600
Subject: [PATCH 11/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Light Cleanup)

---
 libs/SalesforceSDK/res/layout/sf__login.xml           |  1 -
 .../src/com/salesforce/androidsdk/ui/LoginActivity.kt | 11 ++++-------
 .../NativeSampleApps/RestExplorer/AndroidManifest.xml |  1 -
 .../samples/restexplorer/RestExplorerApp.java         |  8 +-------
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/libs/SalesforceSDK/res/layout/sf__login.xml b/libs/SalesforceSDK/res/layout/sf__login.xml
index d9ae78b222..9cd8336667 100644
--- a/libs/SalesforceSDK/res/layout/sf__login.xml
+++ b/libs/SalesforceSDK/res/layout/sf__login.xml
@@ -55,6 +55,5 @@
             android:textAllCaps="false"
             android:textSize="14sp"
             android:textStyle="bold"/>
-
     </LinearLayout>
 </RelativeLayout>
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 82a6eda909..f0cd03d1f0 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -121,7 +121,6 @@ import java.net.URLDecoder
 import com.salesforce.androidsdk.R.layout.sf__login as sf__login_layout
 import com.salesforce.androidsdk.R.menu.sf__login as sf__login_menu
 
-
 /**
  * Login activity authenticates a user. Authorization happens inside a web view.
  * Once an authorization code is obtained, it is exchanged for access and
@@ -187,7 +186,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         // Setup content view
         setContentView(sf__login_layout)
-
         if (salesforceSDKManager.isIDPLoginFlowEnabled) {
             findViewById<Button>(sf__idp_login_button).visibility = VISIBLE
         }
@@ -365,9 +363,9 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         wasBackgrounded = false
     }
 
-    public override fun onSaveInstanceState(bundle: Bundle) {
-        super.onSaveInstanceState(bundle)
-        webviewHelper?.saveState(bundle)
+    public override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        webviewHelper?.saveState(outState)
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent) =
@@ -569,7 +567,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
     private fun isQRLogin(intent: Intent): Boolean {
         return SalesforceSDKManager.getInstance().isQRLoginFlowEnabled
-            && intent.data?.path?.contains(LOGIN_QR_PATH) == true
+                && intent.data?.path?.contains(LOGIN_QR_PATH) == true
     }
 
     private data class BridgeInfo(
@@ -755,4 +753,3 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
     }
 }
-
diff --git a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
index c9df45348c..c553f8d572 100644
--- a/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
+++ b/native/NativeSampleApps/RestExplorer/AndroidManifest.xml
@@ -55,7 +55,6 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
         </activity>
 
 	</application>
diff --git a/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java b/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
index 79f57d1e2d..5bdc24f8a1 100644
--- a/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
+++ b/native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/RestExplorerApp.java
@@ -63,13 +63,7 @@ public void onCreate() {
          * Replace 'com.salesforce.samples.salesforceandroididptemplateapp' with the package name
          * of the IDP app meant to be used.
          */
-		// SalesforceSDKManager.getInstance().setIDPAppPackageName("com.salesforce.samples.salesforceandroididptemplateapp");
-
-		/*
-		 * Uncomment the following line enable QR login flow. This will allow the user to
-		 * login by scanning a QR code.
-		 */
-		SalesforceSDKManager.getInstance().setQRLoginFlowEnabled(true);
+         SalesforceSDKManager.getInstance().setIDPAppPackageName("com.salesforce.samples.salesforceandroididptemplateapp");
 
 		/*
 		 * Un-comment the line below to enable push notifications in this app.

From 57dc2c1fa9b29ecb28a182210ed32b2296e35616 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Mon, 22 Jul 2024 12:31:50 -0600
Subject: [PATCH 12/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Light Code Style And Commentary Cleanup)

---
 .../androidsdk/app/SalesforceSDKManager.kt    |  1 +
 .../salesforce/androidsdk/ui/LoginActivity.kt | 78 +++++++++----------
 .../androidsdk/ui/OAuthWebviewHelper.kt       |  3 +-
 3 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
index 6a63bd8c0f..f00371e104 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
@@ -258,6 +258,7 @@ open class SalesforceSDKManager protected constructor(
             field = value
         }
 
+    /** Indicates if login via the UI bridge API via QR code is enabled */
     @set:Synchronized
     open var isQRLoginFlowEnabled = false
 
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index f0cd03d1f0..43e331d309 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -169,7 +169,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         salesforceSDKManager.setViewNavigationVisibility(this)
 
         val loginOptions = if (isQRLogin) {
-            // Get app login options
+            // Get the app's login options
             salesforceSDKManager.loginOptions
         } else {
             // Get login options from the intent's extras
@@ -226,7 +226,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             this
         )
 
-        // QR login
         if (isQRLogin) {
             loginFromQR("?" + intent.data?.query)
         } else {
@@ -565,33 +564,26 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
 
-    private fun isQRLogin(intent: Intent): Boolean {
-        return SalesforceSDKManager.getInstance().isQRLoginFlowEnabled
-                && intent.data?.path?.contains(LOGIN_QR_PATH) == true
-    }
+    private fun isQRLogin(intent: Intent) = SalesforceSDKManager.getInstance().isQRLoginFlowEnabled
+            && intent.data?.path?.contains(LOGIN_QR_PATH) == true
 
-    private data class BridgeInfo(
+    private data class UiBridgeInfo(
         val frontdoorBridgeUrl: String,
         val pkceCodeVerifier: String
     )
 
-    private fun parseQRContents(qrContents: String?): BridgeInfo? {
-        if (qrContents != null) {
-            d(TAG, "qrContents-->${qrContents}")
-            val bridgeJsonString = extractBridgeJsonParam(qrContents)
-            d(TAG, "bridgeJsonString-->${bridgeJsonString}")
-            if (bridgeJsonString != null) {
-                val bridgeInfo = parseBridgeInfo(bridgeJsonString)
-                d(TAG, "bridgeInfo-->${bridgeInfo}")
-                return bridgeInfo
+    private fun parseQRContents(qrContents: String?) =
+        qrContents?.let { qrContentsUnwrapped ->
+            extractBridgeJsonParam(qrContentsUnwrapped)?.let { bridgeJsonStringUnwrapped ->
+                parseBridgeInfo(bridgeJsonStringUnwrapped)
             }
         }
-        return null
-    }
 
     private fun extractBridgeJsonParam(qrContents: String): String? {
-        // Coming from intent (external QR reader) we have ?bridgeJson={...}
-        // Coming from embedded QR reader we have ?bridgeJson=%7B...%7D
+        /*
+         * Coming from intent (external QR reader) expect ?bridgeJson={...}
+         * Coming from embedded QR reader expect ?bridgeJson=%7B...%7D
+         */
         val regexExternal = """\?bridgeJson=(\{.*\})""".toRegex()
         val regexInternal = """\?bridgeJson=(%7B.*%7D)""".toRegex()
         return regexExternal.find(qrContents)?.groups?.get(1)?.value
@@ -600,40 +592,41 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             }
     }
 
-    private fun parseBridgeInfo(jsonString: String): BridgeInfo {
+    private fun parseBridgeInfo(jsonString: String): UiBridgeInfo {
         val jsonObject = JSONObject(jsonString)
         val frontdoorBridgeUrl = jsonObject.getString(FRONTDOOR_BRIDGE_URL_KEY)
         val pkceCodeVerifier = jsonObject.optString(PKCE_CODE_VERIFIER_KEY, "")
-        return BridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
+        return UiBridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
     }
 
     /**
-     * Login with qr contents
-     * @param qrContents a url or url query containing a bridgeJson parameter
-     *      bridgeJson parameter should contain a url-encoded JSON with two values: frontdoor_bridge_url and pkce_code_verifier
-     *      if not pkce_code_verifier is specified we use user agent flow
-     * @return true if a frontdoor bridge url could be extracted from qrContents
+     * Login with QR code contents.
+     * @param qrContents A URL or URL query containing a bridge JSON parameter.
+     * The bridge JSON parameter should contain URL-encoded JSON with two
+     * values: frontdoor_bridge_url and pkce_code_verifier. If
+     * pkce_code_verifier is not specified then the user agent flow is used
+     * @return Boolean true if a frontdoor bridge URL could be extracted from QR
+     * contents
      */
-    fun loginFromQR(qrContents: String?): Boolean {
-        val bridgeInfo = parseQRContents(qrContents)
-        if (bridgeInfo != null) {
+    fun loginFromQR(qrContents: String?) =
+        parseQRContents(qrContents)?.let { bridgeInfoUnwrapped ->
             loginWithFrontdoorBridgeUrl(
-                bridgeInfo.frontdoorBridgeUrl,
-                bridgeInfo.pkceCodeVerifier
+                bridgeInfoUnwrapped.frontdoorBridgeUrl,
+                bridgeInfoUnwrapped.pkceCodeVerifier
             )
-            return true
-        }
-        return false
-    }
+            true
+        } ?: false
 
     /**
-     * Login with a frontdoor bridge url and PKCE code verifier
-     * @param frontdoorBridgeUrl
-     * @param pkceCodeVerifier
+     * Login with a front door bridge URL and PKCE code verifier
+     * @param frontdoorBridgeUrl The front door bridge URL
+     * @param pkceCodeVerifier The PKCE code verifier
      */
-    fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
-        webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
-    }
+    @Suppress("MemberVisibilityCanBePrivate")
+    fun loginWithFrontdoorBridgeUrl(
+        frontdoorBridgeUrl: String,
+        pkceCodeVerifier: String
+    ) = webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
 
     internal fun presentBiometric() {
         val biometricPrompt = biometricPrompt
@@ -748,7 +741,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         private const val TAG = "LoginActivity"
 
         const val LOGIN_QR_PATH = "/login/qr"
-        const val BRIDGE_JSON_PARAM = "bridgeJson"
         const val FRONTDOOR_BRIDGE_URL_KEY = "frontdoor_bridge_url"
         const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
     }
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index 3453d74465..74c7144ef9 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -148,7 +148,7 @@ import java.util.function.Consumer
  * @Deprecated This class will no longer be public starting in Mobile SDK 13.0.  It
  * is no longer necessary to extend or change LoginActivity's instance of this class
  * to support multi-factor authentication.  If there are other uses cases please
- * inform the team via Github or our Trailblazer community.  
+ * inform the team via Github or our Trailblazer community.
  */
 @Deprecated(
     "This class will no longer be public starting in Mobile SDK 13.0.",
@@ -1402,7 +1402,6 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
     fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
         val uri = URI(frontdoorBridgeUrl)
         loginOptions.loginUrl = "${uri.scheme}://${uri.host}"
-        d(TAG, "loginUrl-->${loginOptions.loginUrl}")
         codeVerifier = pkceCodeVerifier
         webView?.loadUrl(frontdoorBridgeUrl)
     }

From f9ea0e5c593e4fa3ce3a865971ef88ba26449baf Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Mon, 22 Jul 2024 14:03:44 -0600
Subject: [PATCH 13/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Comprehensive Review)

---
 .../androidsdk/app/SalesforceSDKManager.kt    |   5 +-
 .../salesforce/androidsdk/ui/LoginActivity.kt | 220 ++++++++++++------
 .../androidsdk/ui/OAuthWebviewHelper.kt       |  10 +-
 3 files changed, 155 insertions(+), 80 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
index f00371e104..0e097a4452 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt
@@ -258,9 +258,9 @@ open class SalesforceSDKManager protected constructor(
             field = value
         }
 
-    /** Indicates if login via the UI bridge API via QR code is enabled */
+    /** Indicates if login via QR Code and UI bridge API is enabled */
     @set:Synchronized
-    open var isQRLoginFlowEnabled = false
+    open var isQrCodeLoginEnabled = false
 
     /** Indicates if logout is in progress */
     var isLoggingOut = false
@@ -1561,6 +1561,7 @@ open class SalesforceSDKManager protected constructor(
         open fun getInstance() = INSTANCE ?: throw RuntimeException("Apps must call SalesforceSDKManager.init() first.")
 
         /** Allow Kotlin subclasses to set themselves as the instance. */
+        @Suppress("unused")
         @JvmSynthetic
         fun setInstance(subclass: SalesforceSDKManager) {
             INSTANCE = subclass
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 43e331d309..25659ae26d 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -151,7 +151,8 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         val salesforceSDKManager = SalesforceSDKManager.getInstance()
 
-        val isQRLogin = isQRLogin(intent)
+        // Determine if the activity was created from a deep link intent with QR code log in via UI bridge API parameters.
+        val isDeepLinkedQrCodeLogin = isDeepLinkedQrCodeLogin(intent)
 
         accountAuthenticatorResponse = intent.getParcelableExtra<AccountAuthenticatorResponse?>(
             KEY_ACCOUNT_AUTHENTICATOR_RESPONSE
@@ -168,19 +169,17 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
         salesforceSDKManager.setViewNavigationVisibility(this)
 
-        val loginOptions = if (isQRLogin) {
-            // Get the app's login options
-            salesforceSDKManager.loginOptions
-        } else {
-            // Get login options from the intent's extras
-            fromBundleWithSafeLoginUrl(intent.extras)
+        // Determine login options for QR code login or the app's usual login.
+        val loginOptions = when {
+            isDeepLinkedQrCodeLogin -> salesforceSDKManager.loginOptions
+            else -> fromBundleWithSafeLoginUrl(intent.extras)
         }
 
         // Protect against screenshots
         window.setFlags(FLAG_SECURE, FLAG_SECURE)
 
-        // Fetch authentication configuration if required
-        if (!isQRLogin) {
+        // Fetch authentication configuration except for QR code login.
+        if (!isDeepLinkedQrCodeLogin) {
             salesforceSDKManager.fetchAuthenticationConfiguration()
         }
 
@@ -226,10 +225,10 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
             this
         )
 
-        if (isQRLogin) {
-            loginFromQR("?" + intent.data?.query)
-        } else {
-            certAuthOrLogin()
+        // Prompt user with log in page or log in via other configurations such as QR code.
+        when {
+            isDeepLinkedQrCodeLogin -> loginFromQrCode("?" + intent.data?.query)
+            else -> certAuthOrLogin()
         }
 
         if (!receiverRegistered) {
@@ -564,70 +563,6 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         }
     }
 
-    private fun isQRLogin(intent: Intent) = SalesforceSDKManager.getInstance().isQRLoginFlowEnabled
-            && intent.data?.path?.contains(LOGIN_QR_PATH) == true
-
-    private data class UiBridgeInfo(
-        val frontdoorBridgeUrl: String,
-        val pkceCodeVerifier: String
-    )
-
-    private fun parseQRContents(qrContents: String?) =
-        qrContents?.let { qrContentsUnwrapped ->
-            extractBridgeJsonParam(qrContentsUnwrapped)?.let { bridgeJsonStringUnwrapped ->
-                parseBridgeInfo(bridgeJsonStringUnwrapped)
-            }
-        }
-
-    private fun extractBridgeJsonParam(qrContents: String): String? {
-        /*
-         * Coming from intent (external QR reader) expect ?bridgeJson={...}
-         * Coming from embedded QR reader expect ?bridgeJson=%7B...%7D
-         */
-        val regexExternal = """\?bridgeJson=(\{.*\})""".toRegex()
-        val regexInternal = """\?bridgeJson=(%7B.*%7D)""".toRegex()
-        return regexExternal.find(qrContents)?.groups?.get(1)?.value
-            ?: regexInternal.find(qrContents)?.groups?.get(1)?.value?.let {
-                URLDecoder.decode(it, "UTF-8")
-            }
-    }
-
-    private fun parseBridgeInfo(jsonString: String): UiBridgeInfo {
-        val jsonObject = JSONObject(jsonString)
-        val frontdoorBridgeUrl = jsonObject.getString(FRONTDOOR_BRIDGE_URL_KEY)
-        val pkceCodeVerifier = jsonObject.optString(PKCE_CODE_VERIFIER_KEY, "")
-        return UiBridgeInfo(frontdoorBridgeUrl, pkceCodeVerifier)
-    }
-
-    /**
-     * Login with QR code contents.
-     * @param qrContents A URL or URL query containing a bridge JSON parameter.
-     * The bridge JSON parameter should contain URL-encoded JSON with two
-     * values: frontdoor_bridge_url and pkce_code_verifier. If
-     * pkce_code_verifier is not specified then the user agent flow is used
-     * @return Boolean true if a frontdoor bridge URL could be extracted from QR
-     * contents
-     */
-    fun loginFromQR(qrContents: String?) =
-        parseQRContents(qrContents)?.let { bridgeInfoUnwrapped ->
-            loginWithFrontdoorBridgeUrl(
-                bridgeInfoUnwrapped.frontdoorBridgeUrl,
-                bridgeInfoUnwrapped.pkceCodeVerifier
-            )
-            true
-        } ?: false
-
-    /**
-     * Login with a front door bridge URL and PKCE code verifier
-     * @param frontdoorBridgeUrl The front door bridge URL
-     * @param pkceCodeVerifier The PKCE code verifier
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    fun loginWithFrontdoorBridgeUrl(
-        frontdoorBridgeUrl: String,
-        pkceCodeVerifier: String
-    ) = webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
-
     internal fun presentBiometric() {
         val biometricPrompt = biometricPrompt
         val biometricManager = BiometricManager.from(this)
@@ -735,13 +670,144 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
 
     open fun onBioAuthClick(view: View?) = presentBiometric()
 
+    // region QR Code Login Via UI Bridge API Public Implementation
+
+    /**
+     * Automatically log in with a UI Bridge API login QR code.
+     * @param loginQrCodeContent The login QR code content.  This should be
+     * either a URL or URL query containing the UI Bridge API JSON parameter.
+     * The UI Bridge API JSON parameter should contain URL-encoded JSON with two
+     * values:
+     * - frontdoor_bridge_url
+     * - pkce_code_verifier
+     *
+     * If pkce_code_verifier is not specified then the user agent flow is used
+     * @return Boolean true if a log in attempt is possible using the provided QR
+     * code content, false otherwise
+     */
+    fun loginFromQrCode(
+        loginQrCodeContent: String?
+    ) = uiBridgeApiParametersFromLoginQrCodeContent(
+        loginQrCodeContent
+    )?.let { uiBridgeApiParameters ->
+        loginWithFrontdoorBridgeUrl(
+            uiBridgeApiParameters.frontdoorBridgeUrl,
+            uiBridgeApiParameters.pkceCodeVerifier
+        )
+        true
+    } ?: false
+
+    /**
+     * Automatically log in with a UI Bridge API front door bridge URL and PKCE
+     * code verifier.
+     * @param frontdoorBridgeUrl The UI Bridge API front door bridge URL
+     * @param pkceCodeVerifier The PKCE code verifier
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    fun loginWithFrontdoorBridgeUrl(
+        frontdoorBridgeUrl: String,
+        pkceCodeVerifier: String
+    ) = webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
+
+    // endregion
+    // region QR Code Login Via UI Bridge API Private Implementation
+
+    /**
+     * Determines if QR code login is enabled for the provided intent.
+     * @param intent The intent to determine QR code login enablement for
+     * @return Boolean true if QR code login is enabled for the the intent or
+     * false otherwise
+     */
+    private fun isDeepLinkedQrCodeLogin(
+        intent: Intent
+    ) = SalesforceSDKManager.getInstance().isQrCodeLoginEnabled
+            && intent.data?.path?.contains(LOGIN_QR_PATH) == true
+
+    /**
+     * Parses UI Bridge API parameters from the provided login QR code content.
+     * @param loginQrCodeContent The login QR code content string
+     * @return UiBridgeApiParameters: The UI Bridge API parameters or null if the QR code
+     * content cannot provide them for any reason
+     */
+    private fun uiBridgeApiParametersFromLoginQrCodeContent(
+        loginQrCodeContent: String?
+    ) = loginQrCodeContent?.let { loginQrCodeContentUnwrapped ->
+        uiBridgeApiJsonFromQrCodeContent(loginQrCodeContentUnwrapped)?.let { uiBridgeApiJson ->
+            uiBridgeApiParametersFromUiBridgeApiJson(uiBridgeApiJson)
+        }
+    }
+
+    /**
+     * Parses UI Bridge API parameters JSON from the provided string, which may
+     * be formatted to match either QR code content provided by the intent or
+     * the app's QR code library.
+     *
+     * 1. From intent (external QR reader): ?bridgeJson={...}
+     * 2. From the app's QR reader: ?bridgeJson=%7B...%7D
+     *
+     * @param qrCodeContent The QR code content string
+     * @return String: The UI Bridge API parameter JSON or null if the string
+     * cannot provide the JSON for any reason
+     */
+    private fun uiBridgeApiJsonFromQrCodeContent(
+        qrCodeContent: String
+    ) = qrCodeBridgeJsonRegexExternal.find(qrCodeContent)?.groups?.get(1)?.value
+        ?: qrCodeBridgeJsonRegexInternal.find(qrCodeContent)?.groups?.get(1)?.value?.let {
+            URLDecoder.decode(it, "UTF-8")
+        }
+
+    /**
+     * Creates UI Bridge API parameters from the provided JSON string.
+     * @param uiBridgeApiParameterJsonString The UI Bridge API parameters JSON
+     * string
+     * @return The UI Bridge API parameters
+     */
+    private fun uiBridgeApiParametersFromUiBridgeApiJson(
+        uiBridgeApiParameterJsonString: String
+    ) = JSONObject(uiBridgeApiParameterJsonString).let { uiBridgeApiParameterJson ->
+        UiBridgeApiParameters(
+            uiBridgeApiParameterJson.getString(FRONTDOOR_BRIDGE_URL_KEY),
+            uiBridgeApiParameterJson.optString(PKCE_CODE_VERIFIER_KEY, "")
+        )
+    }
+
+    /**
+     * A data class representing UI Bridge API parameters provided by a login QR
+     * code.
+     */
+    private data class UiBridgeApiParameters(
+
+        /** The front door bridge URL provided by the login QR code */
+        val frontdoorBridgeUrl: String,
+
+        /** The PKCE code verifier provided by the login QR code */
+        val pkceCodeVerifier: String
+    )
+
+    // endregion
+
     companion object {
         const val PICK_SERVER_REQUEST_CODE = 10
         private const val SETUP_REQUEST_CODE = 72
         private const val TAG = "LoginActivity"
 
+        // region QR Code Login Via UI Bridge API Constants
+
+        /** The QR code login intent path */
         const val LOGIN_QR_PATH = "/login/qr"
+
+        /** The login QR code's UI Bridge API parameter's JSON frontdoor bridge URL key */
         const val FRONTDOOR_BRIDGE_URL_KEY = "frontdoor_bridge_url"
+
+        /** The login QR code's UI Bridge API parameter's JSON PKCE code verifier key */
         const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
+
+        /** A regular expression to extract the UI Bridge API parameter JSON from the intent's login QR code content */
+        val qrCodeBridgeJsonRegexExternal by lazy { """\?bridgeJson=(\{.*\})""".toRegex() }
+
+        /** A regular expression to extract the UI Bridge API parameter JSON from the app's login QR code content */
+        val qrCodeBridgeJsonRegexInternal by lazy { """\?bridgeJson=(%7B.*%7D)""".toRegex() }
+
+        // endregion
     }
 }
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index 74c7144ef9..4f0ea330ba 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -1399,7 +1399,15 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
         }
     }
 
-    fun loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl: String, pkceCodeVerifier: String) {
+    /**
+     * Automatically log in using the provided UI Bridge API parameters.
+     * @param frontdoorBridgeUrl The UI Bridge API front door bridge API
+     * @param pkceCodeVerifier The PKCE code verifier
+     */
+    fun loginWithFrontdoorBridgeUrl(
+        frontdoorBridgeUrl: String,
+        pkceCodeVerifier: String
+    ) {
         val uri = URI(frontdoorBridgeUrl)
         loginOptions.loginUrl = "${uri.scheme}://${uri.host}"
         codeVerifier = pkceCodeVerifier

From 6f0974e1588ad9bb0d29b25af1575421356157d7 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Sat, 28 Sep 2024 20:39:45 -0600
Subject: [PATCH 14/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Logic allowing login using front door URL and code verifier to override
 web server Vs. user agent flow)

---
 .../salesforce/androidsdk/ui/LoginActivity.kt |  9 ++++--
 .../androidsdk/ui/OAuthWebviewHelper.kt       | 29 +++++++++++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 25659ae26d..300961d9bd 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -706,7 +706,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
     @Suppress("MemberVisibilityCanBePrivate")
     fun loginWithFrontdoorBridgeUrl(
         frontdoorBridgeUrl: String,
-        pkceCodeVerifier: String
+        pkceCodeVerifier: String?
     ) = webviewHelper?.loginWithFrontdoorBridgeUrl(frontdoorBridgeUrl, pkceCodeVerifier)
 
     // endregion
@@ -767,7 +767,10 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
     ) = JSONObject(uiBridgeApiParameterJsonString).let { uiBridgeApiParameterJson ->
         UiBridgeApiParameters(
             uiBridgeApiParameterJson.getString(FRONTDOOR_BRIDGE_URL_KEY),
-            uiBridgeApiParameterJson.optString(PKCE_CODE_VERIFIER_KEY, "")
+            when (uiBridgeApiParameterJson.has(PKCE_CODE_VERIFIER_KEY)) {
+                true -> uiBridgeApiParameterJson.optString(PKCE_CODE_VERIFIER_KEY)
+                else -> null
+            }
         )
     }
 
@@ -781,7 +784,7 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         val frontdoorBridgeUrl: String,
 
         /** The PKCE code verifier provided by the login QR code */
-        val pkceCodeVerifier: String
+        val pkceCodeVerifier: String?
     )
 
     // endregion
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index 4f0ea330ba..eb91999008 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -156,8 +156,15 @@ import java.util.function.Consumer
 )
 open class OAuthWebviewHelper : KeyChainAliasCallback {
 
+    /** The default, locally generated code verifier */
     private var codeVerifier: String? = null
 
+    /** For Salesforce Identity UI Bridge API support, an overriding front door bridge URL to use in place of the default initial URL */
+    var isUsingFrontDoorBridgeUrl = false
+
+    /** For Salesforce Identity UI Bridge API support, the optional web server flow code verifier accompanying the front door bridge URL.  This can only be used with `overrideWithFrontDoorBridgeUrl` */
+    var frontDoorBridgeCodeVerifier: String? = null
+
     /**
      * The host activity/fragment should pass in an implementation of this
      * interface so that it can notify it of things it needs to do as part of
@@ -660,9 +667,16 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
                         null
                     )
 
-                    else -> when {
-                        codeVerifier?.isNotEmpty() == true -> onWebServerFlowComplete(params["code"])
-                        else -> onAuthFlowComplete(TokenEndpointResponse(params))
+                    else -> {
+                        // Determine if presence of override parameters require the user agent flow.
+                        val overrideWithUserAgentFlow = isUsingFrontDoorBridgeUrl && frontDoorBridgeCodeVerifier == null
+                        when {
+                            instance.useWebServerAuthentication && !overrideWithUserAgentFlow ->
+                                onWebServerFlowComplete(params["code"])
+
+                            else ->
+                                onAuthFlowComplete(TokenEndpointResponse(params))
+                        }
                     }
                 }
             }
@@ -738,7 +752,7 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
                 create(loginOptions.loginUrl),
                 loginOptions.oauthClientId,
                 code,
-                codeVerifier,
+                frontDoorBridgeCodeVerifier ?: codeVerifier,
                 loginOptions.oauthCallbackUrl
             )
         }.onFailure { throwable ->
@@ -1406,11 +1420,14 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
      */
     fun loginWithFrontdoorBridgeUrl(
         frontdoorBridgeUrl: String,
-        pkceCodeVerifier: String
+        pkceCodeVerifier: String?
     ) {
+        isUsingFrontDoorBridgeUrl = true
+
         val uri = URI(frontdoorBridgeUrl)
         loginOptions.loginUrl = "${uri.scheme}://${uri.host}"
-        codeVerifier = pkceCodeVerifier
+        frontDoorBridgeCodeVerifier = pkceCodeVerifier
+
         webView?.loadUrl(frontdoorBridgeUrl)
     }
 

From 42f440f32e23e362a10f5eaf0ab9144f8c517f2b Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Tue, 1 Oct 2024 17:29:31 -0600
Subject: [PATCH 15/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Reduce Companion Member Visibility In `LoginActivity` )

---
 .../src/com/salesforce/androidsdk/ui/LoginActivity.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
index 300961d9bd..206188ba8e 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -797,19 +797,19 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         // region QR Code Login Via UI Bridge API Constants
 
         /** The QR code login intent path */
-        const val LOGIN_QR_PATH = "/login/qr"
+        private const val LOGIN_QR_PATH = "/login/qr"
 
         /** The login QR code's UI Bridge API parameter's JSON frontdoor bridge URL key */
-        const val FRONTDOOR_BRIDGE_URL_KEY = "frontdoor_bridge_url"
+        private const val FRONTDOOR_BRIDGE_URL_KEY = "frontdoor_bridge_url"
 
         /** The login QR code's UI Bridge API parameter's JSON PKCE code verifier key */
-        const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
+        private const val PKCE_CODE_VERIFIER_KEY = "pkce_code_verifier"
 
         /** A regular expression to extract the UI Bridge API parameter JSON from the intent's login QR code content */
-        val qrCodeBridgeJsonRegexExternal by lazy { """\?bridgeJson=(\{.*\})""".toRegex() }
+        private val qrCodeBridgeJsonRegexExternal by lazy { """\?bridgeJson=(\{.*\})""".toRegex() }
 
         /** A regular expression to extract the UI Bridge API parameter JSON from the app's login QR code content */
-        val qrCodeBridgeJsonRegexInternal by lazy { """\?bridgeJson=(%7B.*%7D)""".toRegex() }
+        private val qrCodeBridgeJsonRegexInternal by lazy { """\?bridgeJson=(%7B.*%7D)""".toRegex() }
 
         // endregion
     }

From 74d1572e8da7bdaa6be98dc4eba9217f43531739 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Tue, 1 Oct 2024 17:33:18 -0600
Subject: [PATCH 16/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Reduce Companion Member Visibility And Improve Naming In
 `OAuthWebViewHelper` )

---
 .../com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index eb91999008..adac1b9317 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -160,10 +160,10 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
     private var codeVerifier: String? = null
 
     /** For Salesforce Identity UI Bridge API support, an overriding front door bridge URL to use in place of the default initial URL */
-    var isUsingFrontDoorBridgeUrl = false
+    private var isUsingFrontDoorBridge = false
 
     /** For Salesforce Identity UI Bridge API support, the optional web server flow code verifier accompanying the front door bridge URL.  This can only be used with `overrideWithFrontDoorBridgeUrl` */
-    var frontDoorBridgeCodeVerifier: String? = null
+    private var frontDoorBridgeCodeVerifier: String? = null
 
     /**
      * The host activity/fragment should pass in an implementation of this
@@ -669,7 +669,7 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
 
                     else -> {
                         // Determine if presence of override parameters require the user agent flow.
-                        val overrideWithUserAgentFlow = isUsingFrontDoorBridgeUrl && frontDoorBridgeCodeVerifier == null
+                        val overrideWithUserAgentFlow = isUsingFrontDoorBridge && frontDoorBridgeCodeVerifier == null
                         when {
                             instance.useWebServerAuthentication && !overrideWithUserAgentFlow ->
                                 onWebServerFlowComplete(params["code"])
@@ -1422,7 +1422,7 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
         frontdoorBridgeUrl: String,
         pkceCodeVerifier: String?
     ) {
-        isUsingFrontDoorBridgeUrl = true
+        isUsingFrontDoorBridge = true
 
         val uri = URI(frontdoorBridgeUrl)
         loginOptions.loginUrl = "${uri.scheme}://${uri.host}"

From a2a35754b194e30abaccb51ac1373cafbd706e47 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Wed, 2 Oct 2024 13:26:45 -0600
Subject: [PATCH 17/17] @W-16171409: [Android] Add QR Code Login Support in
 MSDK (Reset Front Door Bridge Parameters On Authorization Failure)

---
 .../androidsdk/ui/OAuthWebviewHelper.kt       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
index adac1b9317..7af64ac754 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/OAuthWebviewHelper.kt
@@ -333,6 +333,10 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
     ) {
         val instance = SalesforceSDKManager.getInstance()
 
+        // Reset state from previous log in attempt.
+        // - Salesforce Identity UI Bridge API log in, such as QR code log in.
+        resetFrontDoorBridgeUrl()
+
         e(TAG, "$error: $errorDesc", e)
 
         // Broadcast a notification that the authentication flow failed
@@ -510,6 +514,11 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
         useWebServerAuthentication: Boolean,
         useHybridAuthentication: Boolean
     ): URI {
+
+        // Reset log in state,
+        // - Salesforce Identity UI Bridge API log in, such as QR code log in.
+        resetFrontDoorBridgeUrl()
+
         val loginOptions = loginOptions
         val oAuthClientId = oAuthClientId
         val authorizationDisplayType = authorizationDisplayType
@@ -733,6 +742,11 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
     open fun onAuthFlowComplete(tr: TokenEndpointResponse?, nativeLogin: Boolean = false) {
         d(TAG, "token response -> $tr")
         CoroutineScope(IO).launch {
+
+            // Reset log in state,
+            // - Salesforce Identity UI Bridge API log in, such as QR code log in.
+            resetFrontDoorBridgeUrl()
+
             FinishAuthTask().execute(tr, nativeLogin)
         }
     }
@@ -1431,6 +1445,15 @@ open class OAuthWebviewHelper : KeyChainAliasCallback {
         webView?.loadUrl(frontdoorBridgeUrl)
     }
 
+    /**
+     * Resets all state related to Salesforce Identity API UI Bridge front door bridge URL log in to
+     * its default inactive state.
+     */
+    private fun resetFrontDoorBridgeUrl() {
+        isUsingFrontDoorBridge = false
+        frontDoorBridgeCodeVerifier = null
+    }
+
     companion object {
 
         /**