Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 17:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added auth result

Browse Source
This commit is contained in:
M66B
2023-12-19 09:17:03 +01:00
parent 5a72eaf6f5
commit 3aa13a30ba
7 changed files with 3027 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1276,6 +1276,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!((Boolean.FALSE.equals(message.dkim) && check_authentication) ||
(Boolean.FALSE.equals(message.spf) && check_authentication) ||
(Boolean.FALSE.equals(message.dmarc) && check_authentication) ||
(Boolean.FALSE.equals(message.auth) && check_authentication) ||
(Boolean.FALSE.equals(message.reply_domain) && check_reply_domain) ||
(Boolean.FALSE.equals(message.mx) && check_mx) ||
(Boolean.TRUE.equals(message.blocklist) && check_blocklist));
@@ -1377,9 +1378,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!Boolean.FALSE.equals(message.dmarc))
auths = 3;
if (Boolean.TRUE.equals(message.auth))
auths = 3;
boolean verified = (auths == 3 && (!check_tls || Boolean.TRUE.equals(message.tls)));
if (message.dkim == null && message.spf == null && message.dmarc == null)
if (!Boolean.TRUE.equals(message.auth) &&
message.dkim == null && message.spf == null && message.dmarc == null)
ibAuth.setImageLevel(1);
else
ibAuth.setImageLevel(auths + 2);
@@ -2020,9 +2025,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setVisibility(main == null || !main.hasPhoto() ? View.GONE : View.VISIBLE);
if (main != null && "vmc".equals(main.getType()) &&
Boolean.TRUE.equals(message.dkim) &&
Boolean.TRUE.equals(message.spf) &&
Boolean.TRUE.equals(message.dmarc)) {
(Boolean.TRUE.equals(message.auth) ||
(Boolean.TRUE.equals(message.dkim) &&
Boolean.TRUE.equals(message.spf) &&
Boolean.TRUE.equals(message.dmarc)))) {
ibVerified.setImageLevel(main.isVerified() ? 1 : 0);
ibVerified.setImageTintList(ColorStateList.valueOf(main.isVerified()
? colorVerified : colorControlNormal));
@@ -2765,6 +2771,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.append(" DKIM=").append(message.dkim == null ? "-" : (message.dkim ? "✓" : "✗"))
.append(" SPF=").append(message.spf == null ? "-" : (message.spf ? "✓" : "✗"))
.append(" DMARC=").append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"))
.append(" AUTH=").append(message.auth == null ? "-" : (message.auth ? "✓" : "✗"))
.append(" BL=").append(message.blocklist == null ? "-" : (message.blocklist ? "✓" : "✗"))
.append('\n');
}
@@ -4858,6 +4865,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
result.add("SPF");
if (Boolean.FALSE.equals(message.dmarc))
result.add("DMARC");
if (Boolean.FALSE.equals(message.auth))
result.add("AUTH");
if (Boolean.FALSE.equals(message.mx))
result.add("MX");
@@ -4875,7 +4884,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.append(message.spf == null ? "-" : (message.spf ? "✓" : "✗"))
.append('\n');
sb.append("DMARC: ")
.append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"));
.append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"))
.append('\n');
sb.append("AUTH: ")
.append(message.auth == null ? "-" : (message.auth ? "✓" : "✗"));
}
if (native_dkim && !TextUtils.isEmpty(message.signedby)) {
@@ -8142,6 +8154,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
same = false;
log("dmarc changed", next.id);
}
if (!Objects.equals(prev.auth, next.auth)) {
same = false;
log("auth changed", next.id);
}
if (!Objects.equals(prev.mx, next.mx)) {
same = false;
log("mx changed", next.id);