Merge pull request #2748 from brandonpage/missing-user-agent

Fix missing webview user agent.

Author: brandonpage

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

@@ -152,6 +152,7 @@ import kotlinx.coroutines.Dispatchers.Default
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.json.JSONObject
+import java.lang.String.format
 import java.net.URI
 import java.net.URLDecoder
 import java.net.URLEncoder
@@ -180,8 +181,10 @@ open class LoginActivity : FragmentActivity() {
             by viewModels { SalesforceSDKManager.getInstance().loginViewModelFactory }
 
     // Webview and Clients
-    protected open val webViewClient = AuthWebViewClient()
-    protected open val webChromeClient = WebChromeClient()
+    @VisibleForTesting(otherwise = PROTECTED)
+    open val webViewClient = AuthWebViewClient()
+    @VisibleForTesting(otherwise = PROTECTED)
+    open val webChromeClient = WebChromeClient()
     open val webView: WebView by lazy {
         WebView(this.baseContext).apply {
             layoutParams = ViewGroup.LayoutParams(
@@ -191,9 +194,16 @@ open class LoginActivity : FragmentActivity() {
             webViewClient = this@LoginActivity.webViewClient
             webChromeClient = this@LoginActivity.webChromeClient
             setBackgroundColor(Color.Transparent.toArgb())
-            settings.domStorageEnabled = true /* Salesforce Welcome Discovery requires this */
-            @SuppressLint("SetJavaScriptEnabled")
-            settings.javaScriptEnabled = true
+            settings.apply {
+                domStorageEnabled = true /* Salesforce Welcome Discovery requires this */
+                @SuppressLint("SetJavaScriptEnabled")
+                javaScriptEnabled = true
+                userAgentString = format(
+                    "%s %s",
+                    SalesforceSDKManager.getInstance().userAgent,
+                    userAgentString ?: "",
+                )
+            }
         }
     }
 

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

@@ -28,6 +28,7 @@ package com.salesforce.androidsdk.ui
 
 import android.content.Intent
 import android.net.Uri.parse
+import android.webkit.WebView
 import androidx.core.net.toUri
 import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
@@ -163,4 +164,27 @@ class LoginActivityTest {
             }
         }
     }
+
+    @Test
+    fun testWebviewSettings() {
+        launch<LoginActivity>(
+            Intent(
+                getApplicationContext(),
+                LoginActivity::class.java
+            )
+        ).use { activityScenario ->
+
+            activityScenario.onActivity { activity ->
+                val defaultWebview = WebView(activity)
+                val expectedUserAgent = "${SalesforceSDKManager.getInstance().userAgent} ${defaultWebview.settings.userAgentString}"
+
+                assertEquals(activity.webViewClient, activity.webView.webViewClient)
+                assertEquals(activity.webChromeClient, activity.webView.webChromeClient)
+
+                assertTrue(activity.webView.settings.domStorageEnabled)
+                assertTrue(activity.webView.settings.javaScriptEnabled)
+                assertEquals(expectedUserAgent, activity.webView.settings.userAgentString)
+            }
+        }
+    }
 }