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

Added option to disable auto blocking junk senders

Browse Source
This commit is contained in:
M66B
2023-01-14 23:40:22 +01:00
parent b93b192762
commit ffcfb16227
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@@ -211,6 +211,7 @@ public class EntityOperation {
boolean autounflag = prefs.getBoolean("autounflag", false);
boolean reset_importance = prefs.getBoolean("reset_importance", false);
boolean reset_snooze = prefs.getBoolean("reset_snooze", true);
boolean auto_block_sender = prefs.getBoolean("auto_block_sender", true);
if (jargs.opt(1) != null) {
// rules, classify
@@ -230,16 +231,19 @@ public class EntityOperation {
return;
if (EntityFolder.JUNK.equals(target.type) &&
Objects.equals(source.account, target.account) &&
(jargs.opt(3) == null || !jargs.optBoolean(3))) {
Objects.equals(source.account, target.account)) {
Boolean noblock = (Boolean) jargs.opt(3);
jargs.remove(3);
// Prevent blocking self
List<TupleIdentityEx> identities = db.identity().getComposableIdentities(null);
if (!message.fromSelf(identities)) {
EntityLog.log(context, "Auto block sender=" + MessageHelper.formatAddresses(message.from));
EntityContact.update(context,
message.account, message.identity, message.from,
EntityContact.TYPE_JUNK, message.received);
boolean block = (noblock == null ? auto_block_sender : !noblock);
if (block) {
// Prevent blocking self
List<TupleIdentityEx> identities = db.identity().getComposableIdentities(null);
if (!message.fromSelf(identities)) {
EntityLog.log(context, "Auto block sender=" + MessageHelper.formatAddresses(message.from));
EntityContact.update(context,
message.account, message.identity, message.from,
EntityContact.TYPE_JUNK, message.received);
}
}
}