From 5f193486335f71385b59b100902da38cddc6b246 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Sun, 28 Jul 2024 12:04:50 +0700
Subject: [PATCH] refactor: No longer need to use `.orEmpty()` for
 `ImageUtil.isImage`

---
 app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt   | 4 ++--
 .../kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt  | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
index 4517918701..c2176837c4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
@@ -107,7 +107,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
         private fun getCoverFile(parent: UniFile?): UniFile? {
             return parent?.listFiles()
                 ?.filter { it.isFile && it.nameWithoutExtension.equals("cover", ignoreCase = true) }
-                ?.firstOrNull { ImageUtil.isImage(it.name.orEmpty()) { it.openInputStream() } }
+                ?.firstOrNull { ImageUtil.isImage(it.name) { it.openInputStream() } }
         }
 
         private fun getBaseDirectory(): UniFile? {
@@ -353,7 +353,7 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
                 is Format.Directory -> {
                     val entry = format.file.listFiles()
                         ?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) }
-                        ?.find { !it.isDirectory && ImageUtil.isImage(it.name.orEmpty()) { FileInputStream(it.uri.toFile()) } }
+                        ?.find { !it.isDirectory && ImageUtil.isImage(it.name) { FileInputStream(it.uri.toFile()) } }
 
                     entry?.let { updateCover(manga, it.openInputStream()) }
                 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt
index d2f4131d18..e6557c5a13 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/DirectoryPageLoader.kt
@@ -5,8 +5,6 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder
 import eu.kanade.tachiyomi.util.system.ImageUtil
-import java.io.File
-import java.io.FileInputStream
 
 /**
  * Loader used to load a chapter from a directory given on [file].
@@ -18,7 +16,7 @@ class DirectoryPageLoader(val file: UniFile) : PageLoader() {
      */
     override suspend fun getPages(): List<ReaderPage> {
         return file.listFiles()
-            ?.filter { !it.isDirectory && ImageUtil.isImage(it.name.orEmpty()) { it.openInputStream() } }
+            ?.filter { !it.isDirectory && ImageUtil.isImage(it.name) { it.openInputStream() } }
             ?.sortedWith { f1, f2 -> f1.name.orEmpty().compareToCaseInsensitiveNaturalOrder(f2.name.orEmpty()) }
             ?.mapIndexed { i, file ->
                 val streamFn = { file.openInputStream() }