mirror of https://github.com/M66B/FairEmail.git
List only signers
This commit is contained in:
parent
4d8ec8af31
commit
cbe40b5543
|
@ -3505,13 +3505,13 @@ class Core {
|
|||
message.identity = (identity == null ? null : identity.id);
|
||||
boolean fromSelf = message.fromSelf(identity);
|
||||
|
||||
List<String> signers = new ArrayList<>();
|
||||
if (native_dkim &&
|
||||
!fromSelf &&
|
||||
!EntityFolder.isOutgoing(folder.type) &&
|
||||
!BuildConfig.PLAY_STORE_RELEASE) {
|
||||
signers.addAll(helper.verifyDKIM(context));
|
||||
List<String> signers = helper.verifyDKIM(context);
|
||||
message.dkim = !signers.isEmpty();
|
||||
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
|
||||
if (message.dkim) {
|
||||
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
|
||||
if (aligned)
|
||||
|
@ -3521,11 +3521,6 @@ class Core {
|
|||
}
|
||||
}
|
||||
|
||||
String signer = helper.getSigner(authentication);
|
||||
if (signer != null)
|
||||
signers.add(0, signer);
|
||||
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
|
||||
|
||||
if (message.size == null && message.total != null)
|
||||
message.size = message.total;
|
||||
|
||||
|
@ -4671,13 +4666,13 @@ class Core {
|
|||
message.identity = (identity == null ? null : identity.id);
|
||||
boolean fromSelf = message.fromSelf(identity);
|
||||
|
||||
List<String> signers = new ArrayList<>();
|
||||
if (native_dkim &&
|
||||
!fromSelf &&
|
||||
!EntityFolder.isOutgoing(folder.type) &&
|
||||
!BuildConfig.PLAY_STORE_RELEASE) {
|
||||
signers.addAll(helper.verifyDKIM(context));
|
||||
List<String> signers = helper.verifyDKIM(context);
|
||||
message.dkim = !signers.isEmpty();
|
||||
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
|
||||
if (message.dkim) {
|
||||
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
|
||||
if (aligned)
|
||||
|
@ -4687,11 +4682,6 @@ class Core {
|
|||
}
|
||||
}
|
||||
|
||||
String signer = helper.getSigner(authentication);
|
||||
if (signer != null)
|
||||
signers.add(0, signer);
|
||||
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
|
||||
|
||||
// Borrow reply name from sender name
|
||||
if (message.from != null && message.from.length == 1 &&
|
||||
message.reply != null && message.reply.length == 1) {
|
||||
|
|
Loading…
Reference in New Issue