Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 22:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent answer loop

Browse Source
This commit is contained in:
M66B
2020-05-25 15:01:30 +02:00
parent ad387e133f
commit 7234c33818
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,6 +396,19 @@ public class EntityRule {
if (answer == null)
throw new IllegalArgumentException("Rule answer not found");
Address[] from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
// Prevent loop
List<EntityMessage> messages = db.message().getMessagesByThread(
message.account, message.thread, null, message.folder);
for (EntityMessage threaded : messages)
if (!threaded.id.equals(message.id) &&
MessageHelper.equal(threaded.from, from)) {
EntityLog.log(context, "Answer loop" +
" name=" + answer.name +
" from=" + MessageHelper.formatAddresses(from));
return false;
}
EntityMessage reply = new EntityMessage();
reply.account = message.account;
@@ -406,7 +419,7 @@ public class EntityRule {
reply.inreplyto = message.msgid;
reply.thread = message.thread;
reply.to = (message.reply == null || message.reply.length == 0 ? message.from : message.reply);
reply.from = new InternetAddress[]{new InternetAddress(identity.email, identity.name)};
reply.from = from;
if (cc)
reply.cc = message.cc;
reply.unsubscribe = "mailto:" + identity.email;