mirror of https://github.com/M66B/FairEmail.git
Case insensitive signers check
This commit is contained in:
parent
6019218e18
commit
5b88be244e
|
@ -2649,9 +2649,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
signers.append(signer);
|
signers.append(signer);
|
||||||
for (Address a : envelop) {
|
for (Address a : envelop) {
|
||||||
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
|
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
|
||||||
if (domain != null && Objects.equals(
|
if (signer != null && domain != null && Objects.equals(
|
||||||
UriHelper.getRootDomain(context, signer),
|
UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)),
|
||||||
UriHelper.getRootDomain(context, domain))) {
|
UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT)))) {
|
||||||
signers.setSpan(new ForegroundColorSpan(textColorLink), start, signers.length(), 0);
|
signers.setSpan(new ForegroundColorSpan(textColorLink), start, signers.length(), 0);
|
||||||
known_signer = true;
|
known_signer = true;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -2648,15 +2648,14 @@ 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)
|
||||||
for (Address a : envelop) {
|
for (Address a : envelop) {
|
||||||
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
|
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
|
||||||
if (domain != null && Objects.equals(
|
if (signer != null && domain != null && Objects.equals(
|
||||||
UriHelper.getRootDomain(context, signer),
|
UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)),
|
||||||
UriHelper.getRootDomain(context, domain)))
|
UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT))))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue