diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index 520817885..fa8d61388 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -523,8 +523,9 @@ interface JsExtensions : JsEncodeUtils { fun unArchiveFile(zipPath: String): String { if (zipPath.isEmpty()) return "" val zipFile = getFile(zipPath) - return ArchiveUtils.deCompress(zipFile.absolutePath).toString() - .substring(FileUtils.getCachePath().length) + return ArchiveUtils.deCompress(zipFile.absolutePath).let { + ArchiveUtils.TEMP_FOLDER_NAME + File.separator + MD5Utils.md5Encode16(zipFile.name) + } } /** diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 4b9c281da..c3763fb56 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -540,7 +540,7 @@ class BookInfoActivity : onClick?.invoke(it) } } else { - showDecompressFileImportAlert(files) + showDecompressFileImportAlert(files, onClick) } } } diff --git a/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt index 1d092f373..e16a73a1e 100644 --- a/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ArchiveUtils.kt @@ -12,9 +12,10 @@ import java.io.File @Suppress("unused", "MemberVisibilityCanBePrivate") object ArchiveUtils { + const val TEMP_FOLDER_NAME = "ArchiveTemp" // 临时目录 下次启动自动删除 val TEMP_PATH: String by lazy { - appCtx.externalCache.getFile("ArchiveTemp").createFolderReplace().absolutePath + appCtx.externalCache.getFile(TEMP_FOLDER_NAME).createFolderReplace().absolutePath } fun deCompress(