From 9d5978aca015499502f47e432494abf089319895 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Sat, 2 Mar 2024 18:27:19 +0600
Subject: [PATCH] Address `ZipFile` deprecation warning

---
 .../eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt | 4 ++--
 .../kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt   | 4 ++--
 .../mihon/core/common/extensions/SeekableByteChannel.kt   | 8 ++++++++
 .../kotlin/tachiyomi/source/local/LocalSource.kt          | 6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 core/common/src/main/kotlin/mihon/core/common/extensions/SeekableByteChannel.kt

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
index fadba25c4..89856bf22 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ZipPageLoader.kt
@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.loader
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
-import org.apache.commons.compress.archivers.zip.ZipFile
+import mihon.core.common.extensions.toZipFile
 import tachiyomi.core.common.util.system.ImageUtil
 import java.nio.channels.SeekableByteChannel
 
@@ -12,7 +12,7 @@ import java.nio.channels.SeekableByteChannel
  */
 internal class ZipPageLoader(channel: SeekableByteChannel) : PageLoader() {
 
-    private val zip = ZipFile(channel)
+    private val zip = channel.toZipFile()
 
     override var isLocal: Boolean = true
 
diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
index f664c175b..29cea5824 100644
--- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
+++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.util.storage
 
+import mihon.core.common.extensions.toZipFile
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.apache.commons.compress.archivers.zip.ZipFile
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.io.Closeable
@@ -17,7 +17,7 @@ class EpubFile(channel: SeekableByteChannel) : Closeable {
     /**
      * Zip file of this epub.
      */
-    private val zip = ZipFile(channel)
+    private val zip = channel.toZipFile()
 
     /**
      * Path separator used by this epub.
diff --git a/core/common/src/main/kotlin/mihon/core/common/extensions/SeekableByteChannel.kt b/core/common/src/main/kotlin/mihon/core/common/extensions/SeekableByteChannel.kt
new file mode 100644
index 000000000..69e2d7201
--- /dev/null
+++ b/core/common/src/main/kotlin/mihon/core/common/extensions/SeekableByteChannel.kt
@@ -0,0 +1,8 @@
+package mihon.core.common.extensions
+
+import org.apache.commons.compress.archivers.zip.ZipFile
+import java.nio.channels.SeekableByteChannel
+
+fun SeekableByteChannel.toZipFile(): ZipFile {
+    return ZipFile.Builder().setSeekableByteChannel(this).get()
+}
diff --git a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
index b1ae25236..9e2aa8406 100644
--- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
+++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
@@ -16,9 +16,9 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import logcat.LogPriority
+import mihon.core.common.extensions.toZipFile
 import nl.adaptivity.xmlutil.AndroidXmlReader
 import nl.adaptivity.xmlutil.serialization.XML
-import org.apache.commons.compress.archivers.zip.ZipFile
 import tachiyomi.core.common.i18n.stringResource
 import tachiyomi.core.metadata.comicinfo.COMIC_INFO_FILE
 import tachiyomi.core.metadata.comicinfo.ComicInfo
@@ -210,7 +210,7 @@ actual class LocalSource(
         for (chapter in chapterArchives) {
             when (Format.valueOf(chapter)) {
                 is Format.Zip -> {
-                    ZipFile(chapter.openReadOnlyChannel(context)).use { zip: ZipFile ->
+                    chapter.openReadOnlyChannel(context).toZipFile().use { zip ->
                         zip.getEntry(COMIC_INFO_FILE)?.let { comicInfoFile ->
                             zip.getInputStream(comicInfoFile).buffered().use { stream ->
                                 return copyComicInfoFile(stream, folder)
@@ -328,7 +328,7 @@ actual class LocalSource(
                     entry?.let { coverManager.update(manga, it.openInputStream()) }
                 }
                 is Format.Zip -> {
-                    ZipFile(format.file.openReadOnlyChannel(context)).use { zip ->
+                    format.file.openReadOnlyChannel(context).toZipFile().use { zip ->
                         val entry = zip.entries.toList()
                             .sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) }
                             .find { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }