|
|
@ -4946,19 +4946,20 @@ class Core {
|
|
|
|
|
|
|
|
|
|
|
|
if (account.protocol == EntityAccount.TYPE_IMAP && folder.read_only)
|
|
|
|
if (account.protocol == EntityAccount.TYPE_IMAP && folder.read_only)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
if (!ActivityBilling.isPro(context))
|
|
|
|
|
|
|
|
return;
|
|
|
|
boolean pro = ActivityBilling.isPro(context);
|
|
|
|
|
|
|
|
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
DB db = DB.getInstance(context);
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
boolean executed = false;
|
|
|
|
boolean executed = false;
|
|
|
|
for (EntityRule rule : rules)
|
|
|
|
if (pro)
|
|
|
|
if (rule.matches(context, message, headers, html)) {
|
|
|
|
for (EntityRule rule : rules)
|
|
|
|
rule.execute(context, message);
|
|
|
|
if (rule.matches(context, message, headers, html)) {
|
|
|
|
executed = true;
|
|
|
|
rule.execute(context, message);
|
|
|
|
if (rule.stop)
|
|
|
|
executed = true;
|
|
|
|
break;
|
|
|
|
if (rule.stop)
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (EntityFolder.INBOX.equals(folder.type))
|
|
|
|
if (EntityFolder.INBOX.equals(folder.type))
|
|
|
|
if (message.from != null) {
|
|
|
|
if (message.from != null) {
|
|
|
|