From 5a71889679f04fb0c294760978e38bc813d9c1da Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Mon, 18 Mar 2024 23:01:23 +0600
Subject: [PATCH] Fix regression from coil3 migration

Fixes #495

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>
(cherry picked from commit 59bedb33ff59ad5db1df2e93567a2266fb63eacc)

# Conflicts:
#	core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
---
 .../tachiyomi/core/common/util/system/ImageUtil.kt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
index b642113c3..39bb27cfb 100644
--- a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
+++ b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
@@ -84,22 +84,20 @@ object ImageUtil {
     }
 
     fun isAnimatedAndSupported(stream: InputStream): Boolean {
-        try {
+        return try {
             val type = getImageType(stream) ?: return false
-            return when (type.format) {
+            // https://coil-kt.github.io/coil/getting_started/#supported-image-formats
+            when (type.format) {
                 Format.Gif -> true
-                // Coil supports animated WebP on Android 9.0+
-                // https://coil-kt.github.io/coil/getting_started/#supported-image-formats
+                // Animated WebP on Android 9+
                 Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-                // Coil supports animated Heif on Android 11+
-                // https://coil-kt.github.io/coil/getting_started/#supported-image-formats
+                // Animated Heif on Android 11+
                 Format.Heif -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
                 else -> false
             }
         } catch (e: Exception) {
-            /* Do Nothing */
+            false
         }
-        return false
     }
 
     private fun getImageType(stream: InputStream): tachiyomi.decoder.ImageType? {