From 1d7fab08cf36b7a4e008544380a6cd070e28c14f Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 10 Jul 2024 12:02:03 +0700 Subject: [PATCH] refactor: Allow nullable [skip ci] --- .../java/eu/kanade/tachiyomi/data/download/DownloadManager.kt | 2 +- .../main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt index 8406b41f1e..ab1c7f86f8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt @@ -181,7 +181,7 @@ class DownloadManager(val context: Context) { fun buildPageList(source: Source, manga: Manga, chapter: Chapter): List { val chapterDir = provider.findChapterDir(chapter, manga, source) val files = chapterDir?.listFiles().orEmpty() - .filter { it.isFile && ImageUtil.isImage(it.name.orEmpty()) { it.openInputStream() } } + .filter { it.isFile && ImageUtil.isImage(it.name) { it.openInputStream() } } if (files.isEmpty()) { throw Exception(context.getString(MR.strings.no_pages_found)) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt index a50571164f..02541144f2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt @@ -44,7 +44,9 @@ import kotlin.math.roundToInt object ImageUtil { - fun isImage(name: String, openStream: (() -> InputStream)? = null): Boolean { + fun isImage(name: String?, openStream: (() -> InputStream)? = null): Boolean { + if (name == null) return false + val extension = name.substringAfterLast('.') return ImageType.entries.any { it.extension == extension } || openStream?.let { findImageType(it) } != null }