From 8a241ccc34066b079e1617e37ec27cbff936811c Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 28 Jun 2022 11:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt | 2 +- app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt | 1 + app/src/main/java/io/legado/app/utils/MapExtensions.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index d24e56de4..980c28836 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -554,7 +554,7 @@ class AnalyzeUrl( } fun getUserAgent(): String { - return headerMap[UA_NAME] ?: AppConfig.userAgent + return headerMap.get(UA_NAME, true) ?: AppConfig.userAgent } fun isPost(): Boolean { diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index 2f314f916..0423cc27f 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -188,6 +188,7 @@ class ReadRssActivity : VMBaseActivity } viewModel.urlLiveData.observe(this) { upJavaScriptEnable() + binding.webView.settings.userAgentString = it.getUserAgent() binding.webView.loadUrl(it.url, it.headerMap) } } diff --git a/app/src/main/java/io/legado/app/utils/MapExtensions.kt b/app/src/main/java/io/legado/app/utils/MapExtensions.kt index 520a2b132..6a5464bad 100644 --- a/app/src/main/java/io/legado/app/utils/MapExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/MapExtensions.kt @@ -9,7 +9,7 @@ fun HashMap.has(key: String, ignoreCase: Boolean = false): Boolean { return false } -fun HashMap.get(key: String, ignoreCase: Boolean = false): Any? { +fun HashMap.get(key: String, ignoreCase: Boolean = false): T? { for (item in this) { if (key.equals(item.key, ignoreCase)) { return item.value