From cbe40b5543e9f3a42f65e225422e15e096316390 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 25 May 2024 09:18:21 +0200
Subject: [PATCH] List only signers

---
 app/src/main/java/eu/faircode/email/Core.java | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 11bc83375a..5748549d40 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -3505,13 +3505,13 @@ class Core {
                         message.identity = (identity == null ? null : identity.id);
                         boolean fromSelf = message.fromSelf(identity);
 
-                        List<String> signers = new ArrayList<>();
                         if (native_dkim &&
                                 !fromSelf &&
                                 !EntityFolder.isOutgoing(folder.type) &&
                                 !BuildConfig.PLAY_STORE_RELEASE) {
-                            signers.addAll(helper.verifyDKIM(context));
+                            List<String> signers = helper.verifyDKIM(context);
                             message.dkim = !signers.isEmpty();
+                            message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
                             if (message.dkim) {
                                 boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
                                 if (aligned)
@@ -3521,11 +3521,6 @@ class Core {
                             }
                         }
 
-                        String signer = helper.getSigner(authentication);
-                        if (signer != null)
-                            signers.add(0, signer);
-                        message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
-
                         if (message.size == null && message.total != null)
                             message.size = message.total;
 
@@ -4671,13 +4666,13 @@ class Core {
             message.identity = (identity == null ? null : identity.id);
             boolean fromSelf = message.fromSelf(identity);
 
-            List<String> signers = new ArrayList<>();
             if (native_dkim &&
                     !fromSelf &&
                     !EntityFolder.isOutgoing(folder.type) &&
                     !BuildConfig.PLAY_STORE_RELEASE) {
-                signers.addAll(helper.verifyDKIM(context));
+                List<String> signers = helper.verifyDKIM(context);
                 message.dkim = !signers.isEmpty();
+                message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
                 if (message.dkim) {
                     boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
                     if (aligned)
@@ -4687,11 +4682,6 @@ class Core {
                 }
             }
 
-            String signer = helper.getSigner(authentication);
-            if (signer != null)
-                signers.add(0, signer);
-            message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
-
             // Borrow reply name from sender name
             if (message.from != null && message.from.length == 1 &&
                     message.reply != null && message.reply.length == 1) {