|
@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.util.system.ImageUtil
|
|
|
import rx.Observable
|
|
|
import java.io.File
|
|
|
import java.nio.charset.StandardCharsets
|
|
|
-import java.util.zip.ZipEntry
|
|
|
import java.util.zip.ZipFile
|
|
|
|
|
|
/**
|
|
@@ -40,7 +39,7 @@ class ZipPageLoader(file: File) : PageLoader() {
|
|
|
override fun getPages(): Observable<List<ReaderPage>> {
|
|
|
return zip.entries().toList()
|
|
|
.filter { !it.isDirectory && ImageUtil.isImage(it.name) { zip.getInputStream(it) } }
|
|
|
- .sortedWith(Comparator<ZipEntry> { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) })
|
|
|
+ .sortedWith { f1, f2 -> f1.name.compareToCaseInsensitiveNaturalOrder(f2.name) }
|
|
|
.mapIndexed { i, entry ->
|
|
|
val streamFn = { zip.getInputStream(entry) }
|
|
|
ReaderPage(i).apply {
|