fix: #295 google login issue.

plateaukao · Oct 20, 2023 · d25c110 · d25c110
1 parent 5ef9b83
commit d25c110
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/src/main/java/info/plateaukao/einkbro/browser/NinjaWebChromeClient.kt b/app/src/main/java/info/plateaukao/einkbro/browser/NinjaWebChromeClient.kt
@@ -7,8 +7,16 @@ import android.net.Uri
 import android.os.Message
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.*
-import android.webkit.WebView.*
+import android.webkit.CookieManager
+import android.webkit.GeolocationPermissions
+import android.webkit.PermissionRequest
+import android.webkit.ValueCallback
+import android.webkit.WebChromeClient
+import android.webkit.WebResourceRequest
+import android.webkit.WebSettings
+import android.webkit.WebView
+import android.webkit.WebView.WebViewTransport
+import android.webkit.WebViewClient
 import info.plateaukao.einkbro.unit.HelperUnit
 import info.plateaukao.einkbro.view.NinjaWebView
 
@@ -65,7 +73,9 @@ class NinjaWebChromeClient(
         val webSettings = webView.settings
         val defaultUserAgent = webSettings.userAgentString
 
-        webSettings.userAgentString = defaultUserAgent.replace("wv", "")
+        webSettings.userAgentString = defaultUserAgent
+            .replace("wv", "")
+            .replace(Regex("Version/\\d+\\.\\d+\\s"), "")
         webSettings.cacheMode = WebSettings.LOAD_DEFAULT
         webSettings.allowFileAccessFromFileURLs = true
         webSettings.allowUniversalAccessFromFileURLs = true

diff --git a/app/src/main/java/info/plateaukao/einkbro/view/NinjaWebView.kt b/app/src/main/java/info/plateaukao/einkbro/view/NinjaWebView.kt
@@ -252,7 +252,9 @@ open class NinjaWebView(
     }
 
     fun updateUserAgentString() {
-        val defaultUserAgentString = WebSettings.getDefaultUserAgent(context).replace("wv", "")
+        val defaultUserAgentString = WebSettings.getDefaultUserAgent(context)
+            .replace("wv", "")
+            .replace(Regex("Version/\\d+\\.\\d+\\s"), "")
         val prefix: String =
             defaultUserAgentString.substring(0, defaultUserAgentString.indexOf(")") + 1)