From 3d60973c9ab40d003577ae281389a782c6f94ada Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Mon, 22 Jul 2024 14:40:45 -0600
Subject: [PATCH] W-16171426: [Android] Update Native Login Sample App to
 include QR Code Login Flow (Comment Out Log In Via UI Bridge API Generated QR
 Codes)

---
 .../app/build.gradle.kts                      |   4 +-
 .../app/src/main/AndroidManifest.xml          |  20 +--
 .../MainApplication.kt                        |   4 +-
 .../QrCodeEnabledLoginActivity.kt             | 144 ++++++++---------
 .../app/src/main/res/layout/sf__login.xml     | 146 +++++++++---------
 .../app/src/main/res/values/bootconfig.xml    |   4 +-
 .../app/src/main/res/values/strings.xml       |   3 +-
 .../app/src/main/res/xml/servers.xml          |   6 -
 8 files changed, 162 insertions(+), 169 deletions(-)
 delete mode 100644 AndroidNativeKotlinTemplate/app/src/main/res/xml/servers.xml

diff --git a/AndroidNativeKotlinTemplate/app/build.gradle.kts b/AndroidNativeKotlinTemplate/app/build.gradle.kts
index 9af953ef..093a5c05 100644
--- a/AndroidNativeKotlinTemplate/app/build.gradle.kts
+++ b/AndroidNativeKotlinTemplate/app/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 dependencies {
     implementation("com.salesforce.mobilesdk:MobileSync:12.1.0")
     // Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes
-    implementation("com.google.zxing:core:3.4.1")
-    implementation("com.journeyapps:zxing-android-embedded:4.3.0")
+//    implementation("com.google.zxing:core:3.4.1")
+//    implementation("com.journeyapps:zxing-android-embedded:4.3.0")
 }
 
 android {
diff --git a/AndroidNativeKotlinTemplate/app/src/main/AndroidManifest.xml b/AndroidNativeKotlinTemplate/app/src/main/AndroidManifest.xml
index bd31898e..28e866ae 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/AndroidManifest.xml
+++ b/AndroidNativeKotlinTemplate/app/src/main/AndroidManifest.xml
@@ -25,22 +25,22 @@
         <!-- Login activity -->
         <!-- Use `android:name="com.salesforce.androidnativekotlintemplate.QrCodeEnabledLoginActivity"` when enabling log in via Salesforce UI Bridge API generated QR codes -->
         <activity
-            android:name="com.salesforce.androidnativekotlintemplate.QrCodeEnabledLoginActivity"
+            android:name="com.salesforce.androidsdk.ui.LoginActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/SalesforceSDK">
 
             <!-- Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes -->
-            <intent-filter>
-                <data
-                    android:host="android"
-                    android:path="/login/qr"
-                    android:scheme="mobileapp" />
-                <action android:name="android.intent.action.VIEW" />
+            <!-- <intent-filter>-->
+            <!--     <data-->
+            <!--         android:host="android"-->
+            <!--         android:path="/login/qr"-->
+            <!--         android:scheme="mobileapp" />-->
+            <!--     <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+            <!--     <category android:name="android.intent.category.BROWSABLE" />-->
+            <!--     <category android:name="android.intent.category.DEFAULT" />-->
+            <!-- </intent-filter>-->
         </activity>
 
     </application>
diff --git a/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/MainApplication.kt b/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/MainApplication.kt
index 66bd7753..a4dee572 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/MainApplication.kt
+++ b/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/MainApplication.kt
@@ -49,7 +49,7 @@ class MainApplication : Application() {
              *
              */
             // Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes
-            QrCodeEnabledLoginActivity::class.java)
+            /*QrCodeEnabledLoginActivity::class.java*/)
         MobileSyncSDKManager.getInstance().registerUsedAppFeature(FEATURE_APP_USES_KOTLIN)
 
         /*
@@ -69,6 +69,6 @@ class MainApplication : Application() {
 
         // Enable login via Salesforce UI Bridge API generated QR code.
         // Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes
-        MobileSyncSDKManager.getInstance().isQrCodeLoginEnabled = true
+        // MobileSyncSDKManager.getInstance().isQrCodeLoginEnabled = true
     }
 }
diff --git a/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/QrCodeEnabledLoginActivity.kt b/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/QrCodeEnabledLoginActivity.kt
index 1ea7ead0..a8190a4f 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/QrCodeEnabledLoginActivity.kt
+++ b/AndroidNativeKotlinTemplate/app/src/main/java/com/salesforce/androidnativekotlintemplate/QrCodeEnabledLoginActivity.kt
@@ -1,72 +1,72 @@
-package com.salesforce.androidnativekotlintemplate
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.view.View.VISIBLE
-import android.widget.Button
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanIntentResult
-import com.journeyapps.barcodescanner.ScanOptions
-import com.salesforce.androidnativekotlintemplate.R.id.qr_login_button
-import com.salesforce.androidsdk.ui.LoginActivity
-
-/**
- * A subclass of Salesforce Mobile SDK's login activity that enables log in via
- * a Salesforce UI Bridge API generated QR code.  If an app wishes not to use
- * this feature, this class can be removed and use the superclass directly.
- *
- */
- // Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes
-class QrCodeEnabledLoginActivity : LoginActivity() {
-
-    // region Activity Implementation
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        findViewById<Button>(qr_login_button).visibility = VISIBLE
-        prepareQRReader()
-    }
-
-    // endregion
-    // region User Interface Events
-
-    /**
-     * An action for the "Log In With QR" button.
-     * @param view The button that the user tapped
-     */
-    fun onQRLoginClick(@Suppress("UNUSED_PARAMETER") view: View?) = startQrCodeReader()
-
-    // endregion
-    // region Private Implementation For QR Code Log In
-
-    private var qrCodeReaderActivityResultLauncher: ActivityResultLauncher<Intent>? = null
-
-    private fun prepareQRReader() {
-        qrCodeReaderActivityResultLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult()
-        ) { resultData: ActivityResult ->
-            if (resultData.resultCode == RESULT_OK) {
-
-                val result = ScanIntentResult.parseActivityResult(
-                    resultData.resultCode,
-                    resultData.data
-                )
-
-                result.contents?.let { qrCodeContent ->
-                    loginFromQrCode(qrCodeContent)
-                }
-            }
-        }
-    }
-
-    private fun startQrCodeReader() {
-        qrCodeReaderActivityResultLauncher?.launch(ScanContract().createIntent(this, ScanOptions()))
-    }
-
-    // endregion
-}
+//package com.salesforce.androidnativekotlintemplate
+//
+//import android.content.Intent
+//import android.os.Bundle
+//import android.view.View
+//import android.view.View.VISIBLE
+//import android.widget.Button
+//import androidx.activity.result.ActivityResult
+//import androidx.activity.result.ActivityResultLauncher
+//import androidx.activity.result.contract.ActivityResultContracts
+//import com.journeyapps.barcodescanner.ScanContract
+//import com.journeyapps.barcodescanner.ScanIntentResult
+//import com.journeyapps.barcodescanner.ScanOptions
+//import com.salesforce.androidnativekotlintemplate.R.id.qr_login_button
+//import com.salesforce.androidsdk.ui.LoginActivity
+//
+///**
+// * A subclass of Salesforce Mobile SDK's login activity that enables log in via
+// * a Salesforce UI Bridge API generated QR code.  If an app wishes not to use
+// * this feature, this class can be removed and use the superclass directly.
+// *
+// */
+// // Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes
+//class QrCodeEnabledLoginActivity : LoginActivity() {
+//
+//    // region Activity Implementation
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//
+//        findViewById<Button>(qr_login_button).visibility = VISIBLE
+//        prepareQRReader()
+//    }
+//
+//    // endregion
+//    // region User Interface Events
+//
+//    /**
+//     * An action for the "Log In With QR" button.
+//     * @param view The button that the user tapped
+//     */
+//    fun onQRLoginClick(@Suppress("UNUSED_PARAMETER") view: View?) = startQrCodeReader()
+//
+//    // endregion
+//    // region Private Implementation For QR Code Log In
+//
+//    private var qrCodeReaderActivityResultLauncher: ActivityResultLauncher<Intent>? = null
+//
+//    private fun prepareQRReader() {
+//        qrCodeReaderActivityResultLauncher = registerForActivityResult(
+//            ActivityResultContracts.StartActivityForResult()
+//        ) { resultData: ActivityResult ->
+//            if (resultData.resultCode == RESULT_OK) {
+//
+//                val result = ScanIntentResult.parseActivityResult(
+//                    resultData.resultCode,
+//                    resultData.data
+//                )
+//
+//                result.contents?.let { qrCodeContent ->
+//                    loginFromQrCode(qrCodeContent)
+//                }
+//            }
+//        }
+//    }
+//
+//    private fun startQrCodeReader() {
+//        qrCodeReaderActivityResultLauncher?.launch(ScanContract().createIntent(this, ScanOptions()))
+//    }
+//
+//    // endregion
+//}
diff --git a/AndroidNativeKotlinTemplate/app/src/main/res/layout/sf__login.xml b/AndroidNativeKotlinTemplate/app/src/main/res/layout/sf__login.xml
index 65e9800c..058ed4bc 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/res/layout/sf__login.xml
+++ b/AndroidNativeKotlinTemplate/app/src/main/res/layout/sf__login.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This override layout adds a "Log In With QR" button to enable log in via Salesforce UI Bridge API generated QR codes -->
-<!-- Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/sf__auth_container_phone"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:windowDrawsSystemBarBackgrounds="true">
+<!--<?xml version="1.0" encoding="utf-8"?>-->
+<!--&lt;!&ndash; This override layout adds a "Log In With QR" button to enable log in via Salesforce UI Bridge API generated QR codes &ndash;&gt;-->
+<!--&lt;!&ndash; Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes &ndash;&gt;-->
+<!--<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
+<!--    android:id="@+id/sf__auth_container_phone"-->
+<!--    android:layout_width="match_parent"-->
+<!--    android:layout_height="match_parent"-->
+<!--    android:windowDrawsSystemBarBackgrounds="true">-->
 
-    <ProgressBar
-        android:id="@+id/sf__loading_spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
+<!--    <ProgressBar-->
+<!--        android:id="@+id/sf__loading_spinner"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_centerInParent="true" />-->
 
-    <WebView
-        android:id="@+id/sf__oauth_webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="none"
-        android:visibility="gone"
-        android:windowDrawsSystemBarBackgrounds="true" />
+<!--    <WebView-->
+<!--        android:id="@+id/sf__oauth_webview"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:scrollbars="none"-->
+<!--        android:visibility="gone"-->
+<!--        android:windowDrawsSystemBarBackgrounds="true" />-->
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
+<!--    <LinearLayout-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_alignParentEnd="true"-->
+<!--        android:layout_alignParentBottom="true"-->
+<!--        android:orientation="vertical">-->
 
-        <Button
-            android:id="@+id/sf__idp_login_button"
-            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:onClick="onIDPLoginClick"
-            android:text="@string/sf__launch_idp"
-            android:textAllCaps="false"
-            android:textColor="?attr/sfColorSecondary"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:visibility="gone" />
+<!--        <Button-->
+<!--            android:id="@+id/sf__idp_login_button"-->
+<!--            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:onClick="onIDPLoginClick"-->
+<!--            android:text="@string/sf__launch_idp"-->
+<!--            android:textAllCaps="false"-->
+<!--            android:textColor="?attr/sfColorSecondary"-->
+<!--            android:textSize="14sp"-->
+<!--            android:textStyle="bold"-->
+<!--            android:visibility="gone" />-->
 
-        <Button
-            android:id="@+id/sf__bio_login_button"
-            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:onClick="onBioAuthClick"
-            android:text="@string/sf__login_with_biometric"
-            android:textAllCaps="false"
-            android:textColor="?attr/sfColorSecondary"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:visibility="gone" />
+<!--        <Button-->
+<!--            android:id="@+id/sf__bio_login_button"-->
+<!--            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:onClick="onBioAuthClick"-->
+<!--            android:text="@string/sf__login_with_biometric"-->
+<!--            android:textAllCaps="false"-->
+<!--            android:textColor="?attr/sfColorSecondary"-->
+<!--            android:textSize="14sp"-->
+<!--            android:textStyle="bold"-->
+<!--            android:visibility="gone" />-->
 
-        <Button
-            android:id="@+id/qr_login_button"
-            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:onClick="onQRLoginClick"
-            android:text="@string/login_with_qr"
-            android:textAllCaps="false"
-            android:textColor="?attr/sfColorSecondary"
-            android:textSize="14sp"
-            android:textStyle="bold"
-            android:visibility="gone" />
-    </LinearLayout>
-</RelativeLayout>
+<!--        <Button-->
+<!--            android:id="@+id/qr_login_button"-->
+<!--            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:onClick="onQRLoginClick"-->
+<!--            android:text="@string/login_with_qr"-->
+<!--            android:textAllCaps="false"-->
+<!--            android:textColor="?attr/sfColorSecondary"-->
+<!--            android:textSize="14sp"-->
+<!--            android:textStyle="bold"-->
+<!--            android:visibility="gone" />-->
+<!--    </LinearLayout>-->
+<!--</RelativeLayout>-->
diff --git a/AndroidNativeKotlinTemplate/app/src/main/res/values/bootconfig.xml b/AndroidNativeKotlinTemplate/app/src/main/res/values/bootconfig.xml
index 11bb5e93..d2cb7d09 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/res/values/bootconfig.xml
+++ b/AndroidNativeKotlinTemplate/app/src/main/res/values/bootconfig.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <string name="remoteAccessConsumerKey">3MVG9.AgwtoIvERSd8i8lePrqfnKG_MM7P9KAJ4g53iaPA4EN8zUt3__o.8YA_hCeRn_kGR.Xe9I9_pnsFuAW</string>
-    <string name="oauthRedirectURI">mobilesdk://android/pn/tester</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/AndroidNativeKotlinTemplate/app/src/main/res/values/strings.xml b/AndroidNativeKotlinTemplate/app/src/main/res/values/strings.xml
index 0f6ff824..68468273 100644
--- a/AndroidNativeKotlinTemplate/app/src/main/res/values/strings.xml
+++ b/AndroidNativeKotlinTemplate/app/src/main/res/values/strings.xml
@@ -11,6 +11,5 @@
 
     <!-- Text for the "Log In With QR" button -->
     <!-- Uncomment when enabling log in via Salesforce UI Bridge API generated QR codes -->
-    <string name="login_with_qr">Log In with QR</string>
-
+    <!-- <string name="login_with_qr">Log In with QR</string> -->
 </resources>
diff --git a/AndroidNativeKotlinTemplate/app/src/main/res/xml/servers.xml b/AndroidNativeKotlinTemplate/app/src/main/res/xml/servers.xml
deleted file mode 100644
index 637b10ee..00000000
--- a/AndroidNativeKotlinTemplate/app/src/main/res/xml/servers.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<servers>
-    <server
-        name="SDB 6"
-        url="https://mobilesdkatsdb6.test1.my.pc-rnd.salesforce.com/" />
-</servers>