copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Remove deprecated API for Android N

Browse source
This commit is contained in:
Cuong M. Tran 2024-06-10 18:51:26 +07:00
parent cdac438f1e
commit e10662f26a
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
3 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/RarPageLoader.kt
View file

@ -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()

11
core/common/src/main/kotlin/eu/kanade/tachiyomi/util/storage/EpubFile.kt
View file

@ -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 <--
/**

15
source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
View file

@ -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