kunfei 4 лет назад
Родитель
Сommit
05a0ed1ddc

+ 3 - 1
app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt

@@ -91,7 +91,9 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
 
     override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_rss_refresh -> viewModel.refresh()
+            R.id.menu_rss_refresh -> viewModel.refresh {
+                binding.webView.reload()
+            }
             R.id.menu_rss_star -> viewModel.favorite()
             R.id.menu_share_it -> viewModel.rssArticle?.let {
                 share(it.link)

+ 4 - 4
app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt

@@ -104,17 +104,17 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
         }
     }
 
-    fun refresh() {
+    fun refresh(finish: () -> Unit) {
         rssArticle?.let { rssArticle ->
             rssSource?.let {
                 val ruleContent = it.ruleContent
                 if (!ruleContent.isNullOrBlank()) {
                     loadContent(rssArticle, ruleContent)
                 } else {
-                    loadUrl(rssArticle.link, rssArticle.origin)
+                    finish.invoke()
                 }
-            } ?: loadUrl(rssArticle.link, rssArticle.origin)
-        }
+            } ?: finish.invoke()
+        } ?: finish.invoke()
     }
 
     fun favorite() {