diff --git a/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt index 33e233ed8..dad53d2db 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/download/DownloadManager.kt @@ -835,5 +835,5 @@ var downloadLocation: UniFile } val DownloadInfo.downloadDir get() = dirname?.let { downloadLocation / it } -val DownloadInfo.archiveFile get() = downloadDir?.findFile("$gid.cbz") +val DownloadInfo.archiveFile get() = downloadDir?.run { findFile("$gid.cbz") ?: findFile("$gid.zip") } val GalleryInfo.tempDownloadDir get() = AppConfig.getTempDir("$gid") diff --git a/app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt b/app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt index 8bfd275b2..bd484b6bc 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/gallery/ArchivePageLoader.kt @@ -55,7 +55,7 @@ class ArchivePageLoader( private val hostJob = launch(start = CoroutineStart.LAZY) { logcat(DEBUG_TAG) { "Open archive ${file.uri.displayPath}" } pfd = file.openFileDescriptor("r") - size = openArchive(pfd.fd, pfd.statSize, gid == 0L) + size = openArchive(pfd.fd, pfd.statSize, gid == 0L || file.name!!.endsWith(".zip")) if (size == 0) { return@launch }