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

Added option to block return path

Browse Source
This commit is contained in:
M66B
2022-01-29 13:22:53 +01:00
parent 220eb6dfda
commit 84c94c79db
7 changed files with 112 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@@ -2669,6 +2669,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
aargs.putLong("folder", message.folder);
aargs.putString("type", message.folderType);
aargs.putString("from", DB.Converters.encodeAddresses(message.from));
aargs.putString("return_path", DB.Converters.encodeAddresses(message.return_path));
aargs.putBoolean("inJunk", EntityFolder.JUNK.equals(message.folderType));
FragmentDialogJunk ask = new FragmentDialogJunk();
@@ -8290,6 +8291,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
protected Void onExecute(Context context, Bundle args) throws JSONException {
long id = args.getLong("id");
boolean block_sender = args.getBoolean("block_sender");
boolean block_return = args.getBoolean("block_return");
boolean block_domain = args.getBoolean("block_domain");
DB db = DB.getInstance(context);
@@ -8307,10 +8309,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (!message.folder.equals(junk.id))
EntityOperation.queue(context, message, EntityOperation.MOVE, junk.id);
if (block_sender)
if (block_sender) {
List<Address> froms = new ArrayList<>();
if (message.from != null)
froms.addAll(Arrays.asList(message.from));
if (block_return && message.return_path != null)
froms.addAll(MessageHelper.exclusive(message.return_path, message.from));
EntityContact.update(context,
message.account, message.from,
message.account, froms.toArray(new Address[0]),
EntityContact.TYPE_JUNK, message.received);
}
if (block_domain) {
List<EntityRule> rules = EntityRule.blockSender(context, message, junk, block_domain);