diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt index 0018c6e17..8a32734c6 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt @@ -60,18 +60,13 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), if (!ruleContent.isNullOrBlank()) { loadContent(rssArticle, ruleContent) } else { - loadUrl(rssArticle) + loadUrl(rssArticle.link, rssArticle.origin) } - } ?: loadUrl(rssArticle) + } ?: loadUrl(rssArticle.link, rssArticle.origin) } } } else { - val analyzeUrl = AnalyzeUrl( - origin, - useWebView = true, - headerMapF = rssSource?.getHeaderMap() - ) - urlLiveData.postValue(analyzeUrl) + loadUrl(origin, origin) } } }.onFinally { @@ -79,10 +74,10 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), } } - private fun loadUrl(rssArticle: RssArticle) { + private fun loadUrl(url: String, baseUrl: String) { val analyzeUrl = AnalyzeUrl( - rssArticle.link, - baseUrl = rssArticle.origin, + ruleUrl = url, + baseUrl = baseUrl, useWebView = true, headerMapF = rssSource?.getHeaderMap() )