From e5f21d6f1a18caf51a6c4308638171bcca8f58ba Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 May 2024 07:40:06 +0200 Subject: [PATCH] Optimization --- .../main/java/eu/faircode/email/MessageHelper.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index c0479a3243..56153262e3 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -2648,14 +2648,16 @@ public class MessageHelper { envelop.addAll(Arrays.asList(from)); if (smtp_from != null) envelop.addAll(Arrays.asList(smtp_from)); - for (String signer : signers) + for (String signer : signers) { + String sdomain = UriHelper.getRootDomain(context, signer); + if (sdomain == null) + continue; for (Address a : envelop) { - String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress()); - if (signer != null && domain != null && Objects.equals( - UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)), - UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT)))) + String edomain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress()); + if (sdomain.equalsIgnoreCase(UriHelper.getRootDomain(context, edomain))) return true; } + } return false; }