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
This commit is contained in:
parent
a4983eb004
commit
5a71889679
@ -84,22 +84,20 @@ object ImageUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun isAnimatedAndSupported(stream: InputStream): Boolean {
|
fun isAnimatedAndSupported(stream: InputStream): Boolean {
|
||||||
try {
|
return try {
|
||||||
val type = getImageType(stream) ?: return false
|
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
|
Format.Gif -> true
|
||||||
// Coil supports animated WebP on Android 9.0+
|
// Animated WebP on Android 9+
|
||||||
// https://coil-kt.github.io/coil/getting_started/#supported-image-formats
|
|
||||||
Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
|
Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
|
||||||
// Coil supports animated Heif on Android 11+
|
// Animated Heif on Android 11+
|
||||||
// https://coil-kt.github.io/coil/getting_started/#supported-image-formats
|
|
||||||
Format.Heif -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
|
Format.Heif -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
|
||||||
else -> false
|
else -> false
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
/* Do Nothing */
|
false
|
||||||
}
|
}
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getImageType(stream: InputStream): tachiyomi.decoder.ImageType? {
|
private fun getImageType(stream: InputStream): tachiyomi.decoder.ImageType? {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user