New feature flag for welcome discovery (WD)

Author: wmathurin

libs/SalesforceSDK/src/com/salesforce/androidsdk/app/Features.java

@@ -44,4 +44,5 @@ public class Features {
     public static final String FEATURE_BIOMETRIC_AUTH = "BA";
     public static final String FEATURE_NATIVE_LOGIN = "NL";
     public static final String FEATURE_QR_CODE_LOGIN = "QR";
+    public static final String FEATURE_WELCOME_DISCOVERY_LOGIN = "WD";
 }

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

@@ -125,6 +125,7 @@ import com.salesforce.androidsdk.R.string.sf__ssl_unknown_error
 import com.salesforce.androidsdk.R.string.sf__ssl_untrusted
 import com.salesforce.androidsdk.accounts.UserAccount
 import com.salesforce.androidsdk.app.Features.FEATURE_QR_CODE_LOGIN
+import com.salesforce.androidsdk.app.Features.FEATURE_WELCOME_DISCOVERY_LOGIN
 import com.salesforce.androidsdk.app.SalesforceSDKManager
 import com.salesforce.androidsdk.app.SalesforceSDKManager.Theme.DARK
 import com.salesforce.androidsdk.auth.HttpAccess
@@ -901,6 +902,20 @@ open class LoginActivity : FragmentActivity() {
      */
     private fun applySalesforceWelcomeDiscoveryIntent(intent: Intent) {
 
+        // Set welcome discovery feature flag if applicable
+        if (isLoginWithWelcomeDiscovery(intent)) {
+            SalesforceSDKManager.getInstance()
+                .registerUsedAppFeature(FEATURE_WELCOME_DISCOVERY_LOGIN);
+        }
+        else {
+            SalesforceSDKManager.getInstance().unregisterUsedAppFeature(
+                FEATURE_WELCOME_DISCOVERY_LOGIN
+            );
+        }
+
+        // Re-apply user agent to WebView
+        webView.settings.userAgentString = SalesforceSDKManager.getInstance().userAgent
+
         // Apply the intent extras' Salesforce Welcome Login hint and host for use in the OAuth authorize URL, if applicable.
         applySalesforceWelcomeLoginHintAndHost(intent)
 
@@ -929,6 +944,19 @@ open class LoginActivity : FragmentActivity() {
         }
     }
 
+    /**
+     * Returns true if intent is for a login with Welcome discovery
+     * - either because the the login url is Welcome discovery (part 1 of the flow)
+     * - there is a login hint (part 2 of the flow)
+     *
+     * @return true when the intent is for a login with Welcome discovery
+     */
+    private fun isLoginWithWelcomeDiscovery(intent: Intent): Boolean {
+        val isWelcomeDiscoveryUrl = intent.data?.let { isSalesforceWelcomeDiscoveryMobileUrl(it) } == true
+        val hasLoginHint = intent.getStringExtra(EXTRA_KEY_LOGIN_HINT) != null
+        return isWelcomeDiscoveryUrl || hasLoginHint
+    }
+
     /**
      * Creates a Salesforce Welcome Discovery mobile URL using the provided
      * Salesforce Welcome Discovery host and path URL.