feat(android): 기본 userAgent에 source에서 전달받은 user agent를 추가하도록 함

classtinginc · Apr 17, 2024 · 0b40215 · 0b40215
1 parent b665453
commit 0b40215
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManagerImpl.kt
@@ -418,6 +418,7 @@ class RNCWebViewManagerImpl {
                 return
             }
             if (source.hasKey("uri")) {
+                val defaultUserAgent = WebSettings.getDefaultUserAgent(view.context)
                 val url = source.getString("uri")
                 val previousUrl = view.url
                 if (previousUrl != null && previousUrl == url) {
@@ -451,7 +452,7 @@ class RNCWebViewManagerImpl {
                         val name = headerCasted.get("name") ?: ""
                         val value = headerCasted.get("value") ?: ""
                         if ("user-agent" == name.lowercase(Locale.ENGLISH)) {
-                          view.settings.userAgentString = value
+                          view.settings.userAgentString = "$defaultUserAgent $value"
                         } else {
                           headerMap[name] = value
                         }
@@ -462,7 +463,8 @@ class RNCWebViewManagerImpl {
                       while (iter.hasNextKey()) {
                         val key = iter.nextKey()
                         if ("user-agent" == key.lowercase(Locale.ENGLISH)) {
-                          view.settings.userAgentString = headers.getString(key)
+                          val customUserAgent = headers.getString(key)
+                          view.settings.userAgentString = "$defaultUserAgent $customUserAgent"
                         } else {
                           headerMap[key] = headers.getString(key)
                         }