renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix:内置浏览器UA未设置

Browse Source
This commit is contained in:
Xwite
2022-04-13 12:13:42 +08:00
parent ccbe25350e
commit e65cf6fa1f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/io/legado/app/ui/browser/WebViewActivity.kt
View File

@@ -15,6 +15,7 @@ import androidx.webkit.WebSettingsCompat
import androidx.webkit.WebViewFeature
import io.legado.app.R
import io.legado.app.base.VMBaseActivity
import io.legado.app.constant.AppConst
import io.legado.app.databinding.ActivityWebViewBinding
import io.legado.app.help.config.AppConfig
import io.legado.app.help.http.CookieStore
@@ -44,10 +45,11 @@ class WebViewActivity : VMBaseActivity<ActivityWebViewBinding, WebViewModel>() {
binding.titleBar.title = intent.getStringExtra("title") ?: getString(R.string.loading)
viewModel.initData(intent) {
val url = viewModel.baseUrl
initWebView(url)
val headerMap = viewModel.headerMap
initWebView(url, headerMap)
val html = viewModel.html
if (html.isNullOrEmpty()) {
binding.webView.loadUrl(url, viewModel.headerMap)
binding.webView.loadUrl(url, headerMap)
} else {
binding.webView.loadDataWithBaseURL(url, html, "text/html", "utf-8", url)
}
@@ -68,7 +70,7 @@ class WebViewActivity : VMBaseActivity<ActivityWebViewBinding, WebViewModel>() {
}
@SuppressLint("JavascriptInterface")
private fun initWebView(url: String) {
private fun initWebView(url: String, headerMap: HashMap<String, String>) {
binding.webView.webChromeClient = CustomWebChromeClient()
binding.webView.webViewClient = CustomWebViewClient()
binding.webView.settings.apply {
@@ -78,6 +80,9 @@ class WebViewActivity : VMBaseActivity<ActivityWebViewBinding, WebViewModel>() {
useWideViewPort = true
loadWithOverviewMode = true
javaScriptEnabled = true
headerMap[AppConst.UA_NAME]?.let {
userAgentString = it
}
}
val cookieManager = CookieManager.getInstance()
cookieManager.setCookie(url, CookieStore.getCookie(url))

3
app/src/main/java/io/legado/app/ui/login/WebViewLoginFragment.kt
View File

@@ -59,6 +59,9 @@ class WebViewLoginFragment : BaseFragment(R.layout.fragment_web_view_login) {
binding.webView.settings.apply {
builtInZoomControls = true
javaScriptEnabled = true
source.getHeaderMap()[AppConst.UA_NAME]?.let {
userAgentString = it
}
}
val cookieManager = CookieManager.getInstance()
source.loginUrl?.let {