gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-09-03 09:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:取消验证没有停止等待

Browse Source
This commit is contained in:
Xwite 2022-05-07 15:49:01 +08:00
parent 1f9b8d0d8b
commit 17f4be037a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/io/legado/app/help/SourceVerificationHelp.kt
View File

@ -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 {
return true
fun checkResult() {
CacheManager.get(key) ?: CacheManager.putMemory(key, "")
}
}

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

@ -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")
val key = "${sourceOrigin}_verificationResult"
CacheManager.get(key) ?: CacheManager.putMemory(key, "")
SourceVerificationHelp.checkResult()
super.onDestroy()
activity?.finish()
}

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

@ -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()
}