From fa550e465b5b7ada8ea5a6d6f7a3fce1059efb6c Mon Sep 17 00:00:00 2001
From: AbdallahMehiz <abdallahmehiz0@gmail.com>
Date: Sat, 3 Feb 2024 22:23:23 +0100
Subject: [PATCH] merge

---
 .../eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt   | 3 +--
 .../kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt | 6 +++---
 gradle/libs.versions.toml                                   | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
index 8eb4255be..11e19c862 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
@@ -104,8 +104,7 @@ class ChapterLoader(
                     is Format.Directory -> DirectoryPageLoader(format.file)
                     is Format.Zip -> ZipPageLoader(format.file.openReadOnlyChannel(context))
                     is Format.SevenZip -> try {
-                        val file = context.contentResolver.openFileDescriptor(format.file.uri, "r")
-                        SevenZipPageLoader(AutoCloseInputStream(file)) {
+                        SevenZipPageLoader(format.file.openReadOnlyChannel(context)) {
                             GlobalScope.launchUI {
                                 context.toast(context.stringResource(MR.strings.loader_7zip_slow_archives, it))
                             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt
index dcbf29f86..41aab4a0f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/SevenZipPageLoader.kt
@@ -4,17 +4,17 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.util.storage.SevenZUtil.getImages
 import org.apache.commons.compress.archivers.sevenz.SevenZFile
-import java.io.FileInputStream
+import java.nio.channels.FileChannel
 
 /**
  * Loader used to load a chapter from a .7z or .cb7 file.
  */
 internal class SevenZipPageLoader(
-    private val file: FileInputStream,
+    private val file: FileChannel,
     private val notifySlowArchive: (method: String) -> Unit,
 ) : PageLoader() {
 
-    private val zip by lazy { SevenZFile(file.channel) }
+    private val zip by lazy { SevenZFile(file) }
 
     override var isLocal: Boolean = true
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e7801bd5..c71546cd5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,7 +34,6 @@ disklrucache = "com.jakewharton:disklrucache:2.0.2"
 unifile = "com.github.tachiyomiorg:unifile:7c257e1c64"
 common-compress = "org.apache.commons:commons-compress:1.25.0"
 junrar = "com.github.junrar:junrar:7.5.5"
-common-compress = "org.apache.commons:commons-compress:1.25.0"
 xz = "org.tukaani:xz:1.9"
 
 sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqlite" }