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

Check for no-reply when executing auto-reply rule

Browse Source
This commit is contained in:
M66B
2024-12-08 15:44:43 +01:00
parent 8c1d8fb21a
commit b94cf503cd
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -1011,11 +1011,22 @@ public class EntityRule {
boolean attached = jargs.optBoolean("attached");
boolean attachments = jargs.optBoolean("attachments");
if (TextUtils.isEmpty(to) &&
message.auto_submitted != null && message.auto_submitted) {
EntityLog.log(context, EntityLog.Type.Rules, message,
"Auto submitted rule=" + name);
return false;
if (TextUtils.isEmpty(to)) {
if (Boolean.TRUE.equals(message.auto_submitted)) {
EntityLog.log(context, EntityLog.Type.Rules, message, "Auto submitted rule=" + name);
return false;
}
Address[] recipients = (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
if (recipients.length == 0) {
EntityLog.log(context, EntityLog.Type.Rules, message, "No recipients rule=" + name);
return false;
}
if (MessageHelper.isNoReply(recipients)) {
EntityLog.log(context, EntityLog.Type.Rules, message, "No-reply rule=" + name);
return false;
}
}
boolean complete = true;

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

@@ -5885,6 +5885,10 @@ public class MessageHelper {
return false;
}
static boolean isNoReply(Address[] addresses) {
return (addresses != null && isNoReply(Arrays.asList(addresses)));
}
static boolean isNoReply(@NonNull List<Address> addresses) {
for (Address address : addresses)
if (isNoReply(address))