@W-19461869: [M1][MSDK13.1] Enable Flexible Server Matching for QR Code Login (Android) (Correct String Resources)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/res/values/sf__strings.xml

@@ -31,6 +31,8 @@
     <string name="sf__setup_biometric_unlock">Setup Biometric Unlock</string>
     <string name="sf__back_button_content_description">Back</string>
     <string name="sf__loading_indicator">Loading</string>
+    <string name="sf__cannot_use_another_apps_login_qr_code">Cannot use another app\'s login QR Code.  Please log in to this app.</string>
+    <string name="sf__cannot_use_another_login_hosts_login_qr_code">Cannot use another login host\'s login QR Code.  Please log in to this app.</string>
 
     <!-- Server picker -->
     <string name="sf__auth_login_production">Production</string>

libs/SalesforceSDK/res/values/strings.xml

@@ -7,8 +7,6 @@
     <string name="app_name">SalesforceSDK</string>
     <string name="account_type">com.salesforce.androidsdk</string>
     <string name="app_package">com.salesforce.androidsdk</string>
-    <string name="cannot_use_another_apps_login_qr_code">Cannot use another app\'s login QR Code.  Please log in to this app.</string>
-    <string name="cannot_use_another_login_hosts_login_qr_code">Cannot use another login host\'s login QR Code.  Please log in to this app.</string>
 
     <!-- If you're only supporting recent versions of Android (e.g. 3.x and up), you can override this to be touch and get a better looking login UI  -->
     <string name="oauth_display_type">touch</string>

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt

@@ -109,8 +109,8 @@ import com.salesforce.androidsdk.R.color.sf__background
 import com.salesforce.androidsdk.R.color.sf__background_dark
 import com.salesforce.androidsdk.R.color.sf__primary_color
 import com.salesforce.androidsdk.R.drawable.sf__action_back
-import com.salesforce.androidsdk.R.string.cannot_use_another_apps_login_qr_code
-import com.salesforce.androidsdk.R.string.cannot_use_another_login_hosts_login_qr_code
+import com.salesforce.androidsdk.R.string.sf__cannot_use_another_apps_login_qr_code
+import com.salesforce.androidsdk.R.string.sf__cannot_use_another_login_hosts_login_qr_code
 import com.salesforce.androidsdk.R.string.sf__biometric_opt_in_title
 import com.salesforce.androidsdk.R.string.sf__generic_authentication_error_title
 import com.salesforce.androidsdk.R.string.sf__jwt_authentication_error
@@ -898,9 +898,9 @@ open class LoginActivity : FragmentActivity() {
         // Alert the user if the front door bridge URL failed validation and was discarded.
         var errorMessage: String? = null
         if (frontdoorBridgeLoginOverride?.matchesConsumerKey == false) {
-            errorMessage = getString(cannot_use_another_apps_login_qr_code)
+            errorMessage = getString(sf__cannot_use_another_apps_login_qr_code)
         } else if (frontdoorBridgeLoginOverride?.matchesLoginHost == false) {
-            errorMessage = getString(cannot_use_another_login_hosts_login_qr_code)
+            errorMessage = getString(sf__cannot_use_another_login_hosts_login_qr_code)
         }
         errorMessage?.let { errorMessage ->
             runOnUiThread {