Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-21 16:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply native DKIM

Browse Source
This commit is contained in:
M66B
2023-08-13 11:07:20 +02:00
parent c0fb0ff358
commit d713815562
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -3376,18 +3376,8 @@ class Core {
message.receipt_request = helper.getReceiptRequested();
message.receipt_to = helper.getReceiptTo();
message.bimi_selector = helper.getBimiSelector();
if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.size() == 0 ? null : TextUtils.join(",", signers));
}
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim) &&
native_dkim && !BuildConfig.PLAY_STORE_RELEASE &&
TextUtils.isEmpty(message.signedby))
message.dkim = false;
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;
@@ -3437,6 +3427,24 @@ class Core {
if (MessageHelper.equalEmail(message.submitter, message.from))
message.submitter = null;
if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.size() == 0 ? null : TextUtils.join(",", signers));
if (Boolean.TRUE.equals(message.dkim)) {
if (signers.size() == 0)
message.dkim = false;
} else {
if (message.from != null)
for (Address from : message.from) {
String domain = UriHelper.getEmailDomain(((InternetAddress) from).getAddress());
if (domain != null && signers.contains(domain)) {
message.dkim = true;
break;
}
}
}
}
if (message.size == null && message.total != null)
message.size = message.total;
@@ -4504,18 +4512,8 @@ class Core {
message.receipt_request = helper.getReceiptRequested();
message.receipt_to = helper.getReceiptTo();
message.bimi_selector = helper.getBimiSelector();
if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.size() == 0 ? null : TextUtils.join(",", signers));
}
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim) &&
native_dkim && !BuildConfig.PLAY_STORE_RELEASE &&
TextUtils.isEmpty(message.signedby))
message.dkim = false;
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;
@@ -4576,6 +4574,24 @@ class Core {
if (MessageHelper.equalEmail(message.submitter, message.from))
message.submitter = null;
if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.size() == 0 ? null : TextUtils.join(",", signers));
if (Boolean.TRUE.equals(message.dkim)) {
if (signers.size() == 0)
message.dkim = false;
} else {
if (message.from != null)
for (Address from : message.from) {
String domain = UriHelper.getEmailDomain(((InternetAddress) from).getAddress());
if (domain != null && signers.contains(domain)) {
message.dkim = true;
break;
}
}
}
}
// Borrow reply name from sender name
if (message.from != null && message.from.length == 1 &&
message.reply != null && message.reply.length == 1) {