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

Consistency

Browse Source
This commit is contained in:
M66B
2020-01-09 09:18:25 +01:00
parent b7b2ff4b3d
commit be00d19d68
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,7 +749,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
aid, thread, threading ? null : id, null);
for (EntityMessage threaded : messages) {
EntityFolder folder = db.folder().getFolder(threaded.folder);
if (folder != null && !folder.read_only)
if (!folder.read_only &&
!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// sent
// trash
!EntityFolder.JUNK.equals(folder.type))
result.add(threaded.id);
}
@@ -3580,12 +3585,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
for (EntityMessage message : messages) {
EntityFolder folder = db.folder().getFolder(message.folder);
if (!folder.read_only && (trash == null ||
(!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// allow sent
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type))))
if (!folder.read_only &&
!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
// allow sent
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type))
trashable = true;
if (!EntityFolder.OUTBOX.equals(folder.type))