From 185f25dd6b2e579336ead5fb68d46dbd3f5b43e4 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 12 Aug 2022 22:28:02 +0800 Subject: [PATCH] fix(AnalyzeUrl): skip analyze when mUrl is DataURL --- .../legado/app/model/analyzeRule/AnalyzeUrl.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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..dcc5d04ac 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 @@ -72,18 +72,16 @@ class AnalyzeUrl( private val enabledCookieJar = source?.enabledCookieJar ?: false init { - if (!mUrl.isDataUrl()) { - val urlMatcher = paramPattern.matcher(baseUrl) - if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start()) - (headerMapF ?: source?.getHeaderMap(true))?.let { - headerMap.putAll(it) - if (it.containsKey("proxy")) { - proxy = it["proxy"] - headerMap.remove("proxy") - } + val urlMatcher = paramPattern.matcher(baseUrl) + if (urlMatcher.find()) baseUrl = baseUrl.substring(0, urlMatcher.start()) + (headerMapF ?: source?.getHeaderMap(true))?.let { + headerMap.putAll(it) + if (it.containsKey("proxy")) { + proxy = it["proxy"] + headerMap.remove("proxy") } - initUrl() } + initUrl() } /**