From 0abee585fcfc153fc43b3a77b60dbb4c8ecb475b Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 22 Aug 2020 18:41:42 -0400
Subject: [PATCH] Some more cleanup to Save as CBZ

---
 .../kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
index 5367f8318..a51c6a9c5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DownloadPageLoader.kt
@@ -40,7 +40,7 @@ class DownloadPageLoader(
     override fun getPages(): Observable<List<ReaderPage>> {
         val chapterPath = downloadProvider.findChapterDir(chapter.chapter, manga, source)
 
-        if (chapterPath?.isFile!!) {
+        if (chapterPath?.isFile == true) {
             val zip = if (!File(chapterPath.filePath!!).canRead()) {
                 val tmpFile = File.createTempFile(chapterPath.name!!.replace(".cbz", ""), ".cbz")
                 val buffer = ByteArray(1024)
@@ -59,7 +59,7 @@ class DownloadPageLoader(
 
             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 {