From fda65c1f24e5c314bd3ce4d59315d1b795b776b0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 2 Oct 2019 13:36:07 +0200
Subject: [PATCH] Underline known contacts

---
 .../java/eu/faircode/email/AdapterMessage.java  | 14 ++++++++++++--
 .../java/eu/faircode/email/ContactInfo.java     | 17 +++++++++++++++--
 app/src/main/java/eu/faircode/email/Core.java   |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a7b2fb34ef..696fb08d53 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -36,6 +36,7 @@ import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.AnimatedImageDrawable;
@@ -189,6 +190,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     private boolean date;
     private boolean threading;
+    private boolean distinguish_contacts;
     private boolean name_email;
     private boolean subject_top;
     private boolean subject_italic;
@@ -737,6 +739,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     outgoing = true;
             Address[] addresses = (outgoing ? message.to : message.senders);
             tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
+            tvFrom.setPaintFlags(tvFrom.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);
             Long size = ("size".equals(sort) ? message.totalSize : message.size);
             tvSize.setText(size == null ? null : Helper.humanReadableByteCount(size, true));
             tvSize.setVisibility(size == null || (message.content && !"size".equals(sort)) ? View.GONE : View.VISIBLE);
@@ -834,10 +837,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }
 
             // Contact info
-            ContactInfo info = ContactInfo.get(context, addresses, true);
+            ContactInfo info = ContactInfo.get(context, message.account, addresses, true);
             if (info == null) {
                 Bundle aargs = new Bundle();
                 aargs.putLong("id", message.id);
+                aargs.putLong("account", message.account);
                 aargs.putSerializable("addresses", addresses);
 
                 new SimpleTask<ContactInfo>() {
@@ -850,8 +854,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected ContactInfo onExecute(Context context, Bundle args) {
+                        long account = args.getLong("account");
                         Address[] addresses = (Address[]) args.getSerializable("addresses");
-                        return ContactInfo.get(context, addresses, false);
+
+                        return ContactInfo.get(context, account, addresses, false);
                     }
 
                     @Override
@@ -987,6 +993,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ivAvatar.setVisibility(View.VISIBLE);
             } else
                 ivAvatar.setVisibility(View.GONE);
+
+            if (distinguish_contacts && info.isKnown())
+                tvFrom.setPaintFlags(tvFrom.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
             //tvFrom.setText(info.getDisplayName(name_email));
         }
 
@@ -3286,6 +3295,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         this.date = prefs.getBoolean("date", true);
         this.threading = prefs.getBoolean("threading", true);
+        this.distinguish_contacts = prefs.getBoolean("distinguish_contacts", false);
         this.name_email = prefs.getBoolean("name_email", false);
         this.subject_top = prefs.getBoolean("subject_top", false);
         this.subject_italic = prefs.getBoolean("subject_italic", true);
diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index dc4341b2b3..fad2b4a58b 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -57,10 +57,11 @@ public class ContactInfo {
     private Bitmap bitmap;
     private String displayName;
     private Uri lookupUri;
+    private boolean known;
     private long time;
 
     private static Map<String, Uri> emailLookup = new ConcurrentHashMap<>();
-    private static Map<String, ContactInfo> emailContactInfo = new HashMap<>();
+    private static final Map<String, ContactInfo> emailContactInfo = new HashMap<>();
 
     private static final ExecutorService executor =
             Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@@ -95,6 +96,10 @@ public class ContactInfo {
         return lookupUri;
     }
 
+    boolean isKnown() {
+        return known;
+    }
+
     private boolean isExpired() {
         return (new Date().getTime() - time > CACHE_CONTACT_DURATION);
     }
@@ -105,7 +110,7 @@ public class ContactInfo {
         }
     }
 
-    static ContactInfo get(Context context, Address[] addresses, boolean cacheOnly) {
+    static ContactInfo get(Context context, long account, Address[] addresses, boolean cacheOnly) {
         if (addresses == null || addresses.length == 0)
             return new ContactInfo();
         InternetAddress address = (InternetAddress) addresses[0];
@@ -155,6 +160,7 @@ public class ContactInfo {
 
                     info.displayName = cursor.getString(colDisplayName);
                     info.lookupUri = lookupUri;
+                    info.known = true;
                 }
             } catch (Throwable ex) {
                 Log.e(ex);
@@ -216,6 +222,13 @@ public class ContactInfo {
         if (info.displayName == null)
             info.displayName = address.getPersonal();
 
+        if (!info.known) {
+            DB db = DB.getInstance(context);
+            EntityContact contact = db.contact().getContact(account, EntityContact.TYPE_TO, info.email);
+
+            info.known = (contact != null);
+        }
+
         synchronized (emailContactInfo) {
             emailContactInfo.put(key, info);
         }
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 08572b20a2..ac271d8db0 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2682,7 +2682,7 @@ class Core {
         // Get contact info
         Map<TupleMessageEx, ContactInfo> messageContact = new HashMap<>();
         for (TupleMessageEx message : messages)
-            messageContact.put(message, ContactInfo.get(context, message.from, false));
+            messageContact.put(message, ContactInfo.get(context, message.account, message.from, false));
 
         // Summary notification
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || notify_summary) {