mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Case insensitive signers check

This commit is contained in:
M66B 2024-05-24 08:38:58 +02:00
parent 6019218e18
commit 5b88be244e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -2649,9 +2649,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
signers.append(signer);
for (Address a : envelop) {
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
if (domain != null && Objects.equals(
UriHelper.getRootDomain(context, signer),
UriHelper.getRootDomain(context, domain))) {
if (signer != null && domain != null && Objects.equals(
UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)),
UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT)))) {
signers.setSpan(new ForegroundColorSpan(textColorLink), start, signers.length(), 0);
known_signer = true;
break;

9
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -2648,15 +2648,14 @@ 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)
for (Address a : envelop) {
String domain = UriHelper.getEmailDomain(((InternetAddress) a).getAddress());
if (domain != null && Objects.equals(
UriHelper.getRootDomain(context, signer),
UriHelper.getRootDomain(context, domain)))
if (signer != null && domain != null && Objects.equals(
UriHelper.getRootDomain(context, signer.toLowerCase(Locale.ROOT)),
UriHelper.getRootDomain(context, domain.toLowerCase(Locale.ROOT))))
return true;
}
}
return false;
}