From 0a4fda6e1b4dc92ae67b3440dafbf2cb1b359c53 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 13 Mar 2020 08:21:42 +0100 Subject: [PATCH] Apply filter archive on trash/delete --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 8334f175a1..c94b044bd4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -764,6 +764,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. args.putLong("account", account); args.putString("thread", thread); args.putLong("id", id); + args.putBoolean("filter_archive", filter_archive); new SimpleTask>() { @Override @@ -771,6 +772,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. long aid = args.getLong("account"); String thread = args.getString("thread"); long id = args.getLong("id"); + boolean filter_archive = args.getBoolean("filter_archive"); ArrayList result = new ArrayList<>(); @@ -783,6 +785,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. for (EntityMessage threaded : messages) { EntityFolder folder = db.folder().getFolder(threaded.folder); if (!folder.read_only && + (!filter_archive || !EntityFolder.ARCHIVE.equals(folder.type)) && !EntityFolder.DRAFTS.equals(folder.type) && !EntityFolder.OUTBOX.equals(folder.type) && // sent @@ -825,6 +828,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. args.putString("thread", thread); args.putLong("id", id); args.putString("type", folderType); + args.putBoolean("filter_archive", filter_archive); new SimpleTask>() { @Override @@ -833,6 +837,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. String thread = args.getString("thread"); long id = args.getLong("id"); String type = args.getString("type"); + boolean filter_archive = args.getBoolean("filter_archive"); ArrayList result = new ArrayList<>(); @@ -849,6 +854,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. EntityFolder folder = db.folder().getFolder(threaded.folder); if (!folder.read_only && !target.id.equals(threaded.folder) && + (!filter_archive || !EntityFolder.ARCHIVE.equals(folder.type)) && !EntityFolder.DRAFTS.equals(folder.type) && !EntityFolder.OUTBOX.equals(folder.type) && (!EntityFolder.SENT.equals(folder.type) || EntityFolder.TRASH.equals(target.type)) && !EntityFolder.TRASH.equals(folder.type) && !EntityFolder.JUNK.equals(folder.type))