From 5e55ed50bff17c6a002612b8975b8157ca11974e Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Mar 2023 08:17:24 +0100 Subject: [PATCH] Apply native DKIM --- app/src/main/java/eu/faircode/email/Core.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 7b86feafe4..31004da564 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3201,8 +3201,13 @@ class Core { message.tls = helper.getTLS(); message.dkim = MessageHelper.getAuthentication("dkim", authentication); - if (Boolean.TRUE.equals(message.dkim)) - message.dkim = helper.checkDKIMRequirements(); + if (Boolean.TRUE.equals(message.dkim)) { + if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) { + if (TextUtils.isEmpty(message.signedby)) + message.dkim = false; + } else + message.dkim = helper.checkDKIMRequirements(); + } message.spf = MessageHelper.getAuthentication("spf", authentication); if (message.spf == null && helper.getSPF()) message.spf = true; @@ -4554,11 +4559,6 @@ class Core { db.endTransaction(); } - if (BuildConfig.DEBUG && - message.signedby == null && - Boolean.TRUE.equals(message.dkim)) - EntityOperation.queue(context, message, EntityOperation.FLAG, true, android.graphics.Color.RED); - try { EntityContact.received(context, account, folder, message);