msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Consistency

Browse Source
pull/172/head
M66B 6 years ago
parent b7b2ff4b3d
commit be00d19d68
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save