From 14fa2fab71a5910198448127bbecd6ff7ea8bcea Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Thu, 12 Oct 2023 19:29:57 +0800 Subject: [PATCH] Remove GIF support on API < 28 --- app/src/main/java/com/hippo/ehviewer/image/Image.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/image/Image.kt b/app/src/main/java/com/hippo/ehviewer/image/Image.kt index 666f31578..40f459c6a 100644 --- a/app/src/main/java/com/hippo/ehviewer/image/Image.kt +++ b/app/src/main/java/com/hippo/ehviewer/image/Image.kt @@ -32,11 +32,11 @@ import android.os.Build import androidx.annotation.RequiresApi import coil.decode.BitmapFactoryDecoder import coil.decode.DecodeUtils -import coil.decode.GifDecoder import coil.decode.ImageSource import coil.decode.isGif import coil.request.Options import com.hippo.ehviewer.R +import com.hippo.ehviewer.util.isAtLeastO import com.hippo.ehviewer.util.isAtLeastP import com.hippo.unifile.UniFile import com.hippo.unifile.openInputStream @@ -97,9 +97,9 @@ class Image private constructor(private val src: AutoCloseable) { decodeDrawable(src.source.imageSource) } else { ImageSource(src.source.openInputStream().source().buffer(), appCtx).use { - val options = Options(appCtx) + val options = Options(appCtx, colorSpace = if (isAtLeastO) colorSpace else null) if (DecodeUtils.isGif(it.source())) { - GifDecoder(it, options).decode().drawable + TODO("Unsupported") } else { BitmapFactoryDecoder(it, options).decode().drawable } @@ -120,7 +120,7 @@ class Image private constructor(private val src: AutoCloseable) { val source = ImageDecoder.createSource(src.source) decodeDrawable(source) } else { - null + TODO("Unsupported") }.also { if (it !is Animatable) src.close() }