diff --git a/app/src/main/java/io/legado/app/help/BookHelp.kt b/app/src/main/java/io/legado/app/help/BookHelp.kt index c8e230cd5..aa31d30c7 100644 --- a/app/src/main/java/io/legado/app/help/BookHelp.kt +++ b/app/src/main/java/io/legado/app/help/BookHelp.kt @@ -139,6 +139,9 @@ object BookHelp { var bytes = analyzeUrl.getByteArrayAwait() //某些图片被加密,需要进一步解密 bookSource?.getContentRule()?.imageDecode?.let { + if (it.isBlank()) { + return@let + } kotlin.runCatching { bookSource.evalJS(it) { put("book", book) diff --git a/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt b/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt index 13ade4694..1166abef5 100644 --- a/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt @@ -17,8 +17,9 @@ class VerificationCodeActivity : override fun onActivityCreated(savedInstanceState: Bundle?) { intent.getStringExtra("imageUrl")?.let { val sourceOrigin = intent.getStringExtra("sourceOrigin") + val sourceName = intent.getStringExtra("sourceName") showDialogFragment( - VerificationCodeDialog(it, sourceOrigin) + VerificationCodeDialog(it, sourceOrigin, sourceName) ) } ?: finish() } diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt index 4ea28ac68..113fb5f25 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt @@ -200,7 +200,7 @@ class ImportBookActivity : VMBaseActivity