From 1eb2f51398fafab138f88e49511dae6ed6278738 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 16 Nov 2022 10:38:30 -0500 Subject: [PATCH] Convert AVIF files to jpegs. --- .../thoughtcrime/securesms/util/ImageCompressionUtil.java | 6 +++++- .../java/org/thoughtcrime/securesms/util/MediaUtil.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ImageCompressionUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ImageCompressionUtil.java index 20e2e0f18..601c8ab4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ImageCompressionUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ImageCompressionUtil.java @@ -87,7 +87,11 @@ public final class ImageCompressionUtil { } private static @NonNull Bitmap.CompressFormat mimeTypeToCompressFormat(@NonNull String mimeType) { - if (MediaUtil.isJpegType(mimeType) || MediaUtil.isHeicType(mimeType) || MediaUtil.isHeifType(mimeType) || MediaUtil.isVideoType(mimeType)) { + if (MediaUtil.isJpegType(mimeType) || + MediaUtil.isHeicType(mimeType) || + MediaUtil.isHeifType(mimeType) || + MediaUtil.isAvifType(mimeType) || + MediaUtil.isVideoType(mimeType)) { return Bitmap.CompressFormat.JPEG; } else { return Bitmap.CompressFormat.PNG; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index b88333315..8730a26a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -56,6 +56,7 @@ public class MediaUtil { public static final String IMAGE_JPEG = "image/jpeg"; public static final String IMAGE_HEIC = "image/heic"; public static final String IMAGE_HEIF = "image/heif"; + public static final String IMAGE_AVIF = "image/avif"; public static final String IMAGE_WEBP = "image/webp"; public static final String IMAGE_GIF = "image/gif"; public static final String AUDIO_AAC = "audio/aac"; @@ -277,6 +278,10 @@ public class MediaUtil { return !TextUtils.isEmpty(contentType) && contentType.trim().equals(IMAGE_HEIF); } + public static boolean isAvifType(String contentType) { + return !TextUtils.isEmpty(contentType) && contentType.trim().equals(IMAGE_AVIF); + } + public static boolean isFile(Attachment attachment) { return !isGif(attachment) && !isImage(attachment) && !isAudio(attachment) && !isVideo(attachment); }