From e10662f26a3accacf9587e73297051d1762f2949 Mon Sep 17 00:00:00 2001 From: "Cuong M. Tran" Date: Mon, 10 Jun 2024 18:51:26 +0700 Subject: [PATCH] Remove deprecated API for Android N --- .../tachiyomi/ui/reader/loader/RarPageLoader.kt | 10 +--------- .../eu/kanade/tachiyomi/util/storage/EpubFile.kt | 11 +---------- .../kotlin/tachiyomi/source/local/LocalSource.kt | 15 ++------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt index 04c357a0e..3a600d5d0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.ui.reader.loader import android.app.Application -import android.os.Build import com.github.junrar.Archive import com.github.junrar.rarfile.FileHeader import com.hippo.unifile.UniFile @@ -16,7 +15,6 @@ import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock -import tachiyomi.core.common.storage.UniFileTempFileManager import tachiyomi.core.common.util.system.ImageUtil import uy.kohesive.injekt.injectLazy import java.io.File @@ -31,13 +29,7 @@ import java.util.concurrent.Executors internal class RarPageLoader(file: UniFile) : PageLoader() { // SY --> - private val tempFileManager: UniFileTempFileManager by injectLazy() - - private val rar = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - Archive(tempFileManager.createTempFile(file)) - } else { - Archive(file.openInputStream()) - } + private val rar = Archive(file.openInputStream()) private val context: Application by injectLazy() private val readerPreferences: ReaderPreferences by injectLazy() 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 ed8339300..25215d5b0 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,15 +1,12 @@ package eu.kanade.tachiyomi.util.storage import android.content.Context -import android.os.Build import com.hippo.unifile.UniFile 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 tachiyomi.core.common.storage.UniFileTempFileManager import tachiyomi.core.common.storage.openReadOnlyChannel -import uy.kohesive.injekt.injectLazy import java.io.Closeable import java.io.File import java.io.InputStream @@ -20,16 +17,10 @@ import java.io.InputStream // SY --> class EpubFile(file: UniFile, context: Context) : Closeable { - private val tempFileManager: UniFileTempFileManager by injectLazy() - /** * Zip file of this epub. */ - private val zip = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - ZipFile.Builder().setFile(tempFileManager.createTempFile(file)).get() - } else { - ZipFile.Builder().setSeekableByteChannel(file.openReadOnlyChannel(context)).get() - } + private val zip = ZipFile.Builder().setSeekableByteChannel(file.openReadOnlyChannel(context)).get() // SY <-- /** 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 ade30a361..d54d490b7 100644 --- a/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt +++ b/source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt @@ -1,7 +1,6 @@ package tachiyomi.source.local import android.content.Context -import android.os.Build import com.hippo.unifile.UniFile import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.Source @@ -21,7 +20,6 @@ import logcat.LogPriority import nl.adaptivity.xmlutil.AndroidXmlReader import nl.adaptivity.xmlutil.serialization.XML import tachiyomi.core.common.i18n.stringResource -import tachiyomi.core.common.storage.UniFileTempFileManager import tachiyomi.core.common.storage.addStreamToZip import tachiyomi.core.common.storage.extension import tachiyomi.core.common.storage.getCoverStreamFromZip @@ -64,7 +62,6 @@ actual class LocalSource( private val json: Json by injectLazy() private val xml: XML by injectLazy() - private val tempFileManager: UniFileTempFileManager by injectLazy() private val POPULAR_FILTERS = FilterList(OrderBy.Popular(context)) private val LATEST_FILTERS = FilterList(OrderBy.Latest(context)) @@ -291,11 +288,7 @@ actual class LocalSource( } } is Format.Rar -> { - val archive = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - JunrarArchive(tempFileManager.createTempFile(chapter)) - } else { - JunrarArchive(chapter.openInputStream()) - } + val archive = JunrarArchive(chapter.openInputStream()) archive.use { rar -> rar.fileHeaders.firstOrNull { it.fileName == COMIC_INFO_FILE }?.let { comicInfoFile -> @@ -428,11 +421,7 @@ actual class LocalSource( } } is Format.Rar -> { - val rarArchive = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - JunrarArchive(tempFileManager.createTempFile(format.file)) - } else { - JunrarArchive(format.file.openInputStream()) - } + val rarArchive = JunrarArchive(format.file.openInputStream()) rarArchive.use { archive -> // SY <-- val entry = archive.fileHeaders