From a3169a86ae3be7e53dc006594bc9c449d5aef89e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 19 Jul 2021 08:59:32 +0200
Subject: [PATCH] Show not authenticated

---
 .../eu/faircode/email/AdapterMessage.java     | 12 +++++++---
 app/src/main/res/drawable/authenticated.xml   |  7 ++++--
 .../res/drawable/twotone_shield_check_24.xml  | 24 +++++++++++++++++++
 .../res/drawable/twotone_shield_cross_24.xml  | 24 +++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/twotone_shield_check_24.xml
 create mode 100644 app/src/main/res/drawable/twotone_shield_cross_24.xml

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1e26436ad6..0f620c3f06 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1046,8 +1046,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibAuth.setImageLevel(0);
                 ibAuth.setImageTintList(ColorStateList.valueOf(colorWarning));
                 ibAuth.setVisibility(View.VISIBLE);
-            } else if (authentication_indicator && auths > 0) {
-                ibAuth.setImageLevel(auths);
+            } else if (authentication_indicator) {
+                ibAuth.setImageLevel(auths + 1);
                 ibAuth.setImageTintList(ColorStateList.valueOf(colorControlNormal));
                 ibAuth.setVisibility(View.VISIBLE);
             } else
@@ -1566,7 +1566,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         Boolean.TRUE.equals(message.dmarc));
                 ibVerified.setImageLevel(verified ? 1 : 0);
                 ibVerified.setImageTintList(ColorStateList.valueOf(verified
-                        ? colorAccent : colorSeparator));
+                        ? colorAccent : colorControlNormal));
                 ibVerified.setContentDescription(context.getString(verified
                         ? R.string.title_advanced_bimi_verified : R.string.title_advanced_bimi_unverified));
                 ibVerified.setVisibility(vmc ? View.VISIBLE : View.GONE);
@@ -3527,6 +3527,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 sb.append(message.checkReplyDomain(context));
             }
 
+            if (message.from != null && message.from.length > 0) {
+                sb.insert(0, '\n');
+                sb.insert(0, MessageHelper.formatAddresses(
+                        message.from, MessageHelper.AddressFormat.EMAIL_ONLY, false));
+            }
+
             ToastEx.makeText(context, sb.toString(), Toast.LENGTH_LONG).show();
         }
 
diff --git a/app/src/main/res/drawable/authenticated.xml b/app/src/main/res/drawable/authenticated.xml
index 7e384c0414..bf42703a60 100644
--- a/app/src/main/res/drawable/authenticated.xml
+++ b/app/src/main/res/drawable/authenticated.xml
@@ -4,12 +4,15 @@
         android:drawable="@drawable/twotone_flag_24"
         android:maxLevel="0" />
     <item
-        android:drawable="@drawable/twotone_shield_warning_24"
+        android:drawable="@drawable/twotone_shield_cross_24"
         android:maxLevel="1" />
     <item
         android:drawable="@drawable/twotone_shield_warning_24"
         android:maxLevel="2" />
     <item
-        android:drawable="@drawable/twotone_shield_24"
+        android:drawable="@drawable/twotone_shield_warning_24"
         android:maxLevel="3" />
+    <item
+        android:drawable="@drawable/twotone_shield_check_24"
+        android:maxLevel="4" />
 </level-list>
diff --git a/app/src/main/res/drawable/twotone_shield_check_24.xml b/app/src/main/res/drawable/twotone_shield_check_24.xml
new file mode 100644
index 0000000000..434e18aa03
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_shield_check_24.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
+        android:strokeAlpha="0.3" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.5"
+        android:scaleY="0.5">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41L9,16.17z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_shield_cross_24.xml b/app/src/main/res/drawable/twotone_shield_cross_24.xml
new file mode 100644
index 0000000000..c92fe2300d
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_shield_cross_24.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="@android:color/white"
+        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
+        android:strokeAlpha="0.3" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.5"
+        android:scaleY="0.5">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z" />
+    </group>
+</vector>