From 1fac4019143acd77ea1d448a5c5d6a18e51d9392 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 16 Dec 2023 10:14:44 +0100
Subject: [PATCH] Show from address/sent time in headers

---
 .../java/eu/faircode/email/ActivityDSN.java   |  2 +-
 .../java/eu/faircode/email/ActivityEML.java   |  2 +-
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../java/eu/faircode/email/HtmlHelper.java    | 20 ++++++++++++++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityDSN.java b/app/src/main/java/eu/faircode/email/ActivityDSN.java
index 32fe6cef9c..645a763dc2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityDSN.java
+++ b/app/src/main/java/eu/faircode/email/ActivityDSN.java
@@ -118,7 +118,7 @@ public class ActivityDSN extends ActivityBase {
                         bos.write(buffer, 0, length);
 
                     String headers = MessageHelper.decodeMime(bos.toString(StandardCharsets.UTF_8.name()));
-                    result.headers = HtmlHelper.highlightHeaders(context, headers, false);
+                    result.headers = HtmlHelper.highlightHeaders(context, null, headers, false);
                 }
 
                 return result;
diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 877135cb43..7f7b0a4647 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -323,7 +323,7 @@ public class ActivityEML extends ActivityBase {
                     MessageHelper.getStructure(imessage, ssb, 0, textColorLink);
                     result.structure = ssb;
 
-                    result.headers = HtmlHelper.highlightHeaders(context, helper.getHeaders(), false);
+                    result.headers = HtmlHelper.highlightHeaders(context, helper.getFrom(), helper.getHeaders(), false);
 
                     return result;
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 30493e1022..c310335dad 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2756,7 +2756,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             if (show_headers && message.headers != null) {
                 Spanned headers = HtmlHelper.highlightHeaders(context,
-                        message.headers, message.blocklist != null && message.blocklist);
+                        message.from, message.headers, message.blocklist != null && message.blocklist);
                 if (BuildConfig.DEBUG && headers instanceof SpannableStringBuilder) {
                     SpannableStringBuilder ssb = (SpannableStringBuilder) headers;
                     ssb.append('\n')
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index cf6984ef69..6ca1eb34d9 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -125,6 +125,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.mail.Address;
 import javax.mail.internet.InternetHeaders;
 import javax.mail.internet.MailDateFormat;
 import javax.mail.internet.MimeUtility;
@@ -2935,7 +2936,7 @@ public class HtmlHelper {
         return ssb.toString();
     }
 
-    static Spanned highlightHeaders(Context context, String headers, boolean blocklist) {
+    static Spanned highlightHeaders(Context context, Address[] from, String headers, boolean blocklist) {
         SpannableStringBuilder ssb = new SpannableStringBuilderEx(headers.replaceAll("\\t", " "));
         int textColorLink = Helper.resolveColor(context, android.R.attr.textColorLink);
         int colorVerified = Helper.resolveColor(context, R.attr.colorVerified);
@@ -2968,6 +2969,23 @@ public class HtmlHelper {
                 Log.w(ex);
             }
 
+            if (tx != null) {
+                ssb.append('\n');
+                int s = ssb.length();
+                ssb.append("\n#0 ").append(DTF.format(tx));
+                ssb.setSpan(new StyleSpan(Typeface.BOLD), s, ssb.length(), 0);
+
+                if (from != null) {
+                    ssb.append('\n');
+                    s = ssb.length();
+                    ssb.append("from");
+                    ssb.setSpan(new ForegroundColorSpan(textColorLink), s, ssb.length(), 0);
+                    ssb.append(' ').append(MessageHelper.formatAddresses(from, true, false));
+                }
+
+                ssb.append('\n');
+            }
+
             String[] received = iheaders.getHeader("Received");
             if (received != null && received.length > 0) {
                 for (int i = received.length - 1; i >= 0; i--) {