From cdb3a782f0a94eff3eeec8cdb8e94713f7b0939e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 3 Jul 2022 07:37:06 +0200
Subject: [PATCH] Sort on sender: show email/name

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 ++--
 app/src/main/java/eu/faircode/email/MessageHelper.java  | 4 +++-
 2 files changed, 5 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 ea22490252..4c214afc94 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7040,7 +7040,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.check_blocklist = prefs.getBoolean("check_blocklist", false);
 
         this.email_format = ("sender".equals(sort)
-                ? MessageHelper.AddressFormat.EMAIL_ONLY
+                ? MessageHelper.AddressFormat.EMAIL_NAME
                 : MessageHelper.getAddressFormat(context));
         this.prefer_contact = prefs.getBoolean("prefer_contact", false);
         this.only_contact = prefs.getBoolean("only_contact", false);
@@ -7711,7 +7711,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         if (!sort.equals(this.sort)) {
             this.sort = sort;
             this.email_format = ("sender".equals(sort)
-                    ? MessageHelper.AddressFormat.EMAIL_ONLY
+                    ? MessageHelper.AddressFormat.EMAIL_NAME
                     : MessageHelper.getAddressFormat(context));
             properties.refresh();
             // Needed to redraw item decorators / add/remove size
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 372ec77038..28b6d61d5f 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2721,7 +2721,7 @@ public class MessageHelper {
         }
     }
 
-    enum AddressFormat {NAME_ONLY, EMAIL_ONLY, NAME_EMAIL}
+    enum AddressFormat {NAME_ONLY, EMAIL_ONLY, NAME_EMAIL, EMAIL_NAME}
 
     static AddressFormat getAddressFormat(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -2792,6 +2792,8 @@ public class MessageHelper {
 
                     if (format == AddressFormat.NAME_EMAIL && !TextUtils.isEmpty(email))
                         formatted.add(personal + " <" + email + ">");
+                    else if (format == AddressFormat.EMAIL_NAME && !TextUtils.isEmpty(email))
+                        formatted.add("<" + email + "> " + personal);
                     else
                         formatted.add(personal);
                 }