Optimization

pull/215/head
M66B 6 months ago
parent 83fa040e45
commit e5f21d6f1a

@ -2648,14 +2648,16 @@ public class MessageHelper {
envelop.addAll(Arrays.asList(from)); envelop.addAll(Arrays.asList(from));
if (smtp_from != null) if (smtp_from != null)
envelop.addAll(Arrays.asList(smtp_from)); 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) { for (Address a : envelop) {
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress()); String edomain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
if (signer != null && domain != null && Objects.equals( if (sdomain.equalsIgnoreCase(UriHelper.getRootDomain(context, edomain)))
UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)),
UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT))))
return true; return true;
} }
}
return false; return false;
} }

Loading…
Cancel
Save