This commit is contained in:
Horis
2024-09-09 20:12:23 +08:00
parent 0d7690b299
commit 71038abbb8
@@ -11,7 +11,6 @@ import io.legado.app.base.BaseViewModel
import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst
import io.legado.app.data.appDb import io.legado.app.data.appDb
import io.legado.app.exception.NoStackTraceException import io.legado.app.exception.NoStackTraceException
import io.legado.app.help.CacheManager
import io.legado.app.help.IntentData import io.legado.app.help.IntentData
import io.legado.app.help.http.newCallResponseBody import io.legado.app.help.http.newCallResponseBody
import io.legado.app.help.http.okHttpClient import io.legado.app.help.http.okHttpClient
@@ -97,7 +96,7 @@ class WebViewModel(application: Application) : BaseViewModel(application) {
fun saveVerificationResult(webView: WebView, success: () -> Unit) { fun saveVerificationResult(webView: WebView, success: () -> Unit) {
if (!sourceVerificationEnable) { if (!sourceVerificationEnable) {
execute { success.invoke() } return success.invoke()
} }
if (refetchAfterSuccess) { if (refetchAfterSuccess) {
execute { execute {
@@ -109,6 +108,7 @@ class WebViewModel(application: Application) : BaseViewModel(application) {
source = source source = source
).getStrResponseAwait(useWebView = false).body ).getStrResponseAwait(useWebView = false).body
SourceVerificationHelp.setResult(sourceOrigin, html ?: "") SourceVerificationHelp.setResult(sourceOrigin, html ?: "")
}.onSuccess {
success.invoke() success.invoke()
} }
} else { } else {
@@ -116,6 +116,7 @@ class WebViewModel(application: Application) : BaseViewModel(application) {
execute { execute {
html = StringEscapeUtils.unescapeJson(it).trim('"') html = StringEscapeUtils.unescapeJson(it).trim('"')
SourceVerificationHelp.setResult(sourceOrigin, html ?: "") SourceVerificationHelp.setResult(sourceOrigin, html ?: "")
}.onSuccess {
success.invoke() success.invoke()
} }
} }