From cc4c8923d758e4a7efcbff5bcd2ada7aa2e692f1 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 4 May 2022 16:44:50 -0400
Subject: [PATCH] Temporarliy disable jpeg xl

Yeah too large and since i cant split apks yet, I'll save it for next release
---
 app/build.gradle.kts                               | 14 ++++++++++++++
 .../data/image/coil/TachiyomiImageDecoder.kt       |  2 +-
 .../eu/kanade/tachiyomi/util/system/ImageUtil.kt   |  5 +++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 64933a6fac..aa54be830b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -50,6 +50,20 @@ android {
         ndk {
             abiFilters += supportedAbis
         }
+        packagingOptions {
+            jniLibs.excludes.addAll(
+                listOf(
+                    "**/libjxl.so",
+                    "**/libjxl_dec.so",
+                    "**/libjxl_threads.so",
+                )
+            )
+        }
+        externalNativeBuild {
+            cmake {
+                this.arguments("-DHAVE_LIBJXL=FALSE")
+            }
+        }
     }
 
     splits {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/TachiyomiImageDecoder.kt b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/TachiyomiImageDecoder.kt
index 58b570d076..36a46c253b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/TachiyomiImageDecoder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/image/coil/TachiyomiImageDecoder.kt
@@ -48,7 +48,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
                 ImageUtil.findImageType(it)
             }
             return when (type) {
-                ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true
+                ImageUtil.ImageType.AVIF/*, ImageUtil.ImageType.JXL */ -> true
                 ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
                 else -> false
             }
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 21428ae375..de448ba570 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
@@ -46,7 +46,7 @@ object ImageUtil {
                 Format.Gif -> ImageType.GIF
                 Format.Heif -> ImageType.HEIF
                 Format.Jpeg -> ImageType.JPEG
-                Format.Jxl -> ImageType.JXL
+//                Format.Jxl -> ImageType.JXL
                 Format.Png -> ImageType.PNG
                 Format.Webp -> ImageType.WEBP
                 else -> null
@@ -87,7 +87,8 @@ object ImageUtil {
         GIF("image/gif", "gif"),
         HEIF("image/heif", "heif"),
         JPEG("image/jpeg", "jpg"),
-        JXL("image/jxl", "jxl"),
+
+//        JXL("image/jxl", "jxl"),
         PNG("image/png", "png"),
         WEBP("image/webp", "webp"),
     }