From 26f3fe4893f515dda51d873580bdbfb7ac16311d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 19 Dec 2019 21:37:09 +0100
Subject: [PATCH] Fill in name from contacts

---
 .../eu/faircode/email/AdapterMessage.java     | 20 ++++++++++++++++---
 .../java/eu/faircode/email/ContactInfo.java   |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 12c9b544b3..257498a3d6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -923,7 +923,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (amessage == null || !amessage.id.equals(id))
                             return;
 
-                        bindContactInfo(info, message);
+                        bindContactInfo(info, addresses, name_email);
                     }
 
                     @Override
@@ -932,7 +932,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     }
                 }.setLog(false).execute(context, owner, aargs, "message:avatar");
             } else
-                bindContactInfo(info, message);
+                bindContactInfo(info, addresses, name_email);
 
             if (viewType == ViewType.THREAD)
                 if (expanded)
@@ -1045,7 +1045,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibFlagged.setVisibility(View.GONE);
         }
 
-        private void bindContactInfo(ContactInfo info, TupleMessageEx message) {
+        private void bindContactInfo(ContactInfo info, Address[] addresses, boolean name_email) {
             if (info.hasPhoto()) {
                 ibAvatar.setImageBitmap(info.getPhotoBitmap());
                 ibAvatar.setVisibility(View.VISIBLE);
@@ -1056,6 +1056,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibAvatar.setTag(lookupUri);
             ibAvatar.setEnabled(lookupUri != null);
 
+            if (addresses != null && addresses.length == 1) {
+                String displayName = info.getDisplayName();
+                if (!TextUtils.isEmpty(displayName)) {
+                    String personal = ((InternetAddress) addresses[0]).getPersonal();
+                    if (TextUtils.isEmpty(personal))
+                        try {
+                            ((InternetAddress) addresses[0]).setPersonal(displayName);
+                            tvFrom.setText(MessageHelper.formatAddresses(addresses, name_email, false));
+                        } catch (UnsupportedEncodingException ex) {
+                            Log.w(ex);
+                        }
+                }
+            }
+
             if (distinguish_contacts && info.isKnown())
                 tvFrom.setPaintFlags(tvFrom.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
         }
diff --git a/app/src/main/java/eu/faircode/email/ContactInfo.java b/app/src/main/java/eu/faircode/email/ContactInfo.java
index fc416df614..c4f19bd937 100644
--- a/app/src/main/java/eu/faircode/email/ContactInfo.java
+++ b/app/src/main/java/eu/faircode/email/ContactInfo.java
@@ -70,6 +70,10 @@ public class ContactInfo {
         return bitmap;
     }
 
+    String getDisplayName() {
+        return displayName;
+    }
+
     String getDisplayName(boolean name_email) {
         if (!name_email && displayName != null)
             return displayName;