Merge remote-tracking branch 'origin/master'

app/src/main/java/io/legado/app/help/SourceVerificationHelp.kt

@@ -12,6 +12,7 @@ import splitties.init.appCtx
 
 object SourceVerificationHelp {
 
+    private var key: String = ""
     /** 
      * 获取书源验证结果
      * 图片验证码 防爬 滑动验证码 点击字符 等等
@@ -19,7 +20,7 @@ object SourceVerificationHelp {
     fun getVerificationResult(source: BaseSource?, url: String, title: String, useBrowser: Boolean): String {
         source ?: throw NoStackTraceException("getVerificationResult parameter source cannot be null")
         return runBlocking {
-            val key = "${source.getKey()}_verificationResult"
+            key = "${source.getKey()}_verificationResult"
             CacheManager.delete(key)
 
             if (!useBrowser) {
@@ -52,6 +53,7 @@ object SourceVerificationHelp {
      */
     fun startBrowser(source: BaseSource?, url: String, title: String, saveResult: Boolean? = false) {
         source ?: throw NoStackTraceException("startBrowser parameter source cannot be null")
+        key = "${source.getKey()}_verificationResult"
         appCtx.startActivity<WebViewActivity> {
             putExtra("title", title)
             putExtra("url", url)
@@ -61,7 +63,7 @@ object SourceVerificationHelp {
         }
     }
 
-    private fun checkActivityStatus(): Boolean {
+    fun checkResult() {
-        return true
+        CacheManager.get(key) ?: CacheManager.putMemory(key, "")
     }
 }

app/src/main/java/io/legado/app/service/CheckSourceService.kt

@@ -135,17 +135,19 @@ class CheckSourceService : BaseService() {
                 ?.filterNot {
                     it.startsWith("Error: ")
                 }?.joinToString("\n")
-            //校验搜索书籍 用户设置校验搜索 并且 搜索链接不为空
+            //校验搜索书籍
-            if (CheckSource.checkSearch && !source.searchUrl.isNullOrBlank()) {
+            if (CheckSource.checkSearch) {
-                val searchBooks = WebBook.searchBookAwait(this, source, searchWord)
+                if (!source.searchUrl.isNullOrBlank()) {
-                if (searchBooks.isEmpty()) {
+                    source.removeGroup("搜索链接规则为空")
-                    source.addGroup("搜索失效")
+                    val searchBooks = WebBook.searchBookAwait(this, source, searchWord)
-                    if (!CheckSource.checkDiscovery) {
+                    if (searchBooks.isEmpty()) {
-                        throw NoStackTraceException("搜索书籍为空")
+                        source.addGroup("搜索失效")
+                    } else {
+                        source.removeGroup("搜索失效")
+                        checkBook(searchBooks.first().toBook(), source)
                     }
                 } else {
-                    source.removeGroup("搜索失效")
+                    source.addGroup("搜索链接规则为空")
-                    checkBook(searchBooks.first().toBook(), source)
                 }
             }
             //校验发现书籍
@@ -159,18 +161,12 @@ class CheckSourceService : BaseService() {
                     }
                 }
                 if (url.isNullOrBlank()) {
-                    when {
+                   source.addGroup("发现规则为空")
-                        !CheckSource.checkSearch -> throw NoStackTraceException("没有发现")
-                        source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容为空并且没有发现")
-                    }
                 } else {
+                    source.removeGroup("发现规则为空")
                     val exploreBooks = WebBook.exploreBookAwait(this, source, url)
                     if (exploreBooks.isEmpty()) {
                         source.addGroup("发现失效")
-                        when {
-                            !CheckSource.checkSearch -> throw NoStackTraceException("发现书籍为空")
-                            source.hasGroup("搜索失效") -> throw NoStackTraceException("搜索内容和发现书籍为空")
-                        }
                     } else {
                         source.removeGroup("发现失效")
                         checkBook(exploreBooks.first().toBook(), source, false)

app/src/main/java/io/legado/app/ui/association/VerificationCodeDialog.kt

@@ -12,6 +12,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.databinding.DialogVerificationCodeViewBinding
 import io.legado.app.help.CacheManager
+import io.legado.app.help.SourceVerificationHelp
 import io.legado.app.help.glide.ImageLoader
 import io.legado.app.help.glide.OkHttpModelLoader
 import io.legado.app.lib.theme.primaryColor
@@ -91,9 +92,7 @@ class VerificationCodeDialog() : BaseDialogFragment(R.layout.dialog_verification
     }
 
     override fun onDestroy() {
-        val sourceOrigin = arguments?.getString("sourceOrigin")
+        SourceVerificationHelp.checkResult()
-        val key = "${sourceOrigin}_verificationResult"
-        CacheManager.get(key) ?: CacheManager.putMemory(key, "")
         super.onDestroy()
         activity?.finish()
     }

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

@@ -17,6 +17,7 @@ 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.SourceVerificationHelp
 import io.legado.app.help.config.AppConfig
 import io.legado.app.help.http.CookieStore
 import io.legado.app.lib.dialogs.SelectItem
@@ -182,6 +183,7 @@ class WebViewActivity : VMBaseActivity<ActivityWebViewBinding, WebViewModel>() {
     }
 
     override fun onDestroy() {
+        SourceVerificationHelp.checkResult()
         super.onDestroy()
         binding.webView.destroy()
     }