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

Apply filter archive on trash/delete

Browse Source
This commit is contained in:
M66B
2020-03-13 08:21:42 +01:00
parent f04e4f8ef9
commit 0a4fda6e1b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<List<Long>>() {
@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<Long> 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<ArrayList<MessageTarget>>() {
@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<MessageTarget> 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))