@W-20161958: [MSDK 13.1][Android] Cannot login GUS using Welcome endpoint (loginActivity_displayWelcomeUnsupportedToastIfNeeded_supportsWelcomeDiscovery)

Author: JohnsonEricAtSalesforce

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

@@ -939,6 +939,26 @@ open class LoginActivity : FragmentActivity() {
         }
     }
 
+    /**
+     * Alerts the user if the Salesforce Welcome Discovery is disabled.
+     * @param supportsWelcomeDiscovery Indicates if Salesforce Welcome Discovery
+     * is supported.
+     * @return Boolean true if the alert was displayed, false otherwise
+     */
+    @VisibleForTesting
+    internal fun displayWelcomeUnsupportedToastIfNeeded(
+        supportsWelcomeDiscovery: Boolean
+    ) = if (!supportsWelcomeDiscovery) {
+        runOnUiThread {
+            makeText(
+                this,
+                getString(salesforce_welcome_is_disabled),
+                LENGTH_LONG
+            ).show()
+        }
+        true
+    } else false
+
     /**
      * Creates a Salesforce Welcome Discovery mobile URL using the provided
      * Salesforce Welcome Discovery host and path URL.
@@ -1035,18 +1055,7 @@ open class LoginActivity : FragmentActivity() {
      */
     private fun useSalesforceWelcomeDiscoveryMobileUrl(uri: Uri) {
         if (isSalesforceWelcomeDiscoveryMobileUrl(uri)) {
-
-            // Alert the user if the Salesforce Welcome Discovery is disabled.
-            if (!SalesforceSDKManager.getInstance().supportsWelcomeDiscovery) {
-                runOnUiThread {
-                    makeText(
-                        this,
-                        getString(salesforce_welcome_is_disabled),
-                        LENGTH_LONG
-                    ).show()
-                }
-            }
-
+            displayWelcomeUnsupportedToastIfNeeded(SalesforceSDKManager.getInstance().supportsWelcomeDiscovery)
             viewModel.loginUrl.postValue(uri.toString())
         }
     }

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/ui/LoginActivityTest.kt

@@ -319,6 +319,23 @@ class LoginActivityTest {
         }
     }
 
+    @Test
+    fun loginActivity_displayWelcomeUnsupportedToastIfNeeded_supportsWelcomeDiscovery() {
+
+        val activityScenario = launch<LoginActivity>(
+            Intent(
+                getApplicationContext(),
+                LoginActivity::class.java
+            )
+        )
+
+        activityScenario.onActivity { activity ->
+
+            assertFalse(activity.displayWelcomeUnsupportedToastIfNeeded(true))
+            assertTrue(activity.displayWelcomeUnsupportedToastIfNeeded(false))
+        }
+    }
+
     @Test
     fun loginActivityLoginUrlObserver_startsBrowserCustomTabAuthorization_onChange() {