From c9bc4df2610280ca183f2ec82463037b54f2c4a8 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 19 Aug 2021 08:24:21 +0200 Subject: [PATCH] Revert "Added support for AVIF" This reverts commit 03e2013ab12d78c48dc8c7c2eab85c00d76ab6cb. --- app/src/main/java/eu/faircode/email/DB.java | 3 --- app/src/main/java/eu/faircode/email/ImageHelper.java | 9 --------- 2 files changed, 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index bbad2dbe8c..ceaef9ac27 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -427,9 +427,6 @@ public abstract class DB extends RoomDatabase { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) for (String img : ImageHelper.IMAGE_TYPES8) image.add("'" + img + "'"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) - for (String img : ImageHelper.IMAGE_TYPES12) - image.add("'" + img + "'"); String images = TextUtils.join(",", image); db.execSQL("CREATE TRIGGER IF NOT EXISTS attachment_insert" + diff --git a/app/src/main/java/eu/faircode/email/ImageHelper.java b/app/src/main/java/eu/faircode/email/ImageHelper.java index ba6c218710..68c01c6db5 100644 --- a/app/src/main/java/eu/faircode/email/ImageHelper.java +++ b/app/src/main/java/eu/faircode/email/ImageHelper.java @@ -109,20 +109,11 @@ class ImageHelper { "image/heif" )); - // https://developer.android.com/about/versions/12/features#avif - static final List IMAGE_TYPES12 = Collections.unmodifiableList(Arrays.asList( - "image/avif" - )); - static boolean isImage(String mimeType) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) if (IMAGE_TYPES8.contains(mimeType)) return true; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) - if (IMAGE_TYPES12.contains(mimeType)) - return true; - return IMAGE_TYPES.contains(mimeType); }