From dcf65d374634e33a6eab76ddf5b8d0f7db0a1cdd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 13 Jun 2020 07:26:59 +0200
Subject: [PATCH] Show no file type icon if unknown file type

---
 .../main/java/eu/faircode/email/AdapterAttachment.java |  5 ++++-
 app/src/main/res/drawable/baseline_description_24.xml  | 10 ----------
 app/src/main/res/layout/item_attachment.xml            |  2 +-
 app/src/main/res/layout/item_attachment_eml.xml        |  2 +-
 4 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/drawable/baseline_description_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index b41afaa4a0..1aa0999556 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -115,7 +115,10 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(attachment.getMimeType());
             if (extension != null)
                 resid = context.getResources().getIdentifier("file_" + extension, "drawable", context.getPackageName());
-            ivType.setImageResource(resid == 0 ? R.drawable.baseline_description_24 : resid);
+            if (resid == 0)
+                ivType.setImageDrawable(null);
+            else
+                ivType.setImageResource(resid);
 
             tvName.setText(attachment.name);
 
diff --git a/app/src/main/res/drawable/baseline_description_24.xml b/app/src/main/res/drawable/baseline_description_24.xml
deleted file mode 100644
index a8c3eacf20..0000000000
--- a/app/src/main/res/drawable/baseline_description_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
-</vector>
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 62cee798f0..0531a98a76 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -33,7 +33,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/tvType"
             app:layout_constraintStart_toEndOf="@id/ibDelete"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/baseline_description_24" />
+            app:srcCompat="@drawable/file_bin" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvName"
diff --git a/app/src/main/res/layout/item_attachment_eml.xml b/app/src/main/res/layout/item_attachment_eml.xml
index 3315d856d3..afcd4be370 100644
--- a/app/src/main/res/layout/item_attachment_eml.xml
+++ b/app/src/main/res/layout/item_attachment_eml.xml
@@ -20,7 +20,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/baseline_description_24" />
+            app:srcCompat="@drawable/file_bin" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvName"