Просмотр исходного кода

Merge pull request #2287 from 821938089/little-fix

一些优化
kunfei 4 лет назад
Родитель
Сommit
3a32709bed

+ 3 - 0
app/src/main/java/io/legado/app/help/BookHelp.kt

@@ -139,6 +139,9 @@ object BookHelp {
             var bytes = analyzeUrl.getByteArrayAwait()
             var bytes = analyzeUrl.getByteArrayAwait()
             //某些图片被加密,需要进一步解密
             //某些图片被加密,需要进一步解密
             bookSource?.getContentRule()?.imageDecode?.let {
             bookSource?.getContentRule()?.imageDecode?.let {
+                if (it.isBlank()) {
+                    return@let
+                }
                 kotlin.runCatching {
                 kotlin.runCatching {
                     bookSource.evalJS(it) {
                     bookSource.evalJS(it) {
                         put("book", book)
                         put("book", book)

+ 2 - 1
app/src/main/java/io/legado/app/ui/association/VerificationCodeActivity.kt

@@ -17,8 +17,9 @@ class VerificationCodeActivity :
     override fun onActivityCreated(savedInstanceState: Bundle?) {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         intent.getStringExtra("imageUrl")?.let {
         intent.getStringExtra("imageUrl")?.let {
             val sourceOrigin = intent.getStringExtra("sourceOrigin")
             val sourceOrigin = intent.getStringExtra("sourceOrigin")
+            val sourceName = intent.getStringExtra("sourceName")
             showDialogFragment(
             showDialogFragment(
-                VerificationCodeDialog(it, sourceOrigin)
+                VerificationCodeDialog(it, sourceOrigin, sourceName)
             )
             )
         } ?: finish()
         } ?: finish()
     }
     }

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt

@@ -200,7 +200,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
     private fun upSort(sort: Int) {
     private fun upSort(sort: Int) {
         viewModel.sort = sort
         viewModel.sort = sort
         putPrefInt(PreferKey.localBookImportSort, sort)
         putPrefInt(PreferKey.localBookImportSort, sort)
-        if (scanDocJob?.isCancelled == true || scanDocJob?.isCompleted == true) {
+        if (scanDocJob?.isActive != true) {
             viewModel.dataCallback?.setItems(adapter.getItems())
             viewModel.dataCallback?.setItems(adapter.getItems())
         }
         }
     }
     }