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

Prevent deleting outbox messages

Browse Source
pull/147/head
M66B 7 years ago
parent cc69cbe9ab
commit d24c0f3e42
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -637,7 +637,7 @@ public class FragmentMessages extends FragmentEx {
for (EntityMessage threaded : messages) { for (EntityMessage threaded : messages) {
EntityFolder folder = db.folder().getFolder(threaded.folder); EntityFolder folder = db.folder().getFolder(threaded.folder);
if (!result.target.id.equals(threaded.folder) && if (!result.target.id.equals(threaded.folder) &&
!EntityFolder.SENT.equals(folder.type) && !EntityFolder.isOutgoing(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) && !EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type)) !EntityFolder.JUNK.equals(folder.type))
result.ids.add(threaded.id); result.ids.add(threaded.id);
@ -1348,9 +1348,11 @@ public class FragmentMessages extends FragmentEx {
boolean archivable = false; boolean archivable = false;
for (EntityMessage message : messages) { for (EntityMessage message : messages) {
EntityFolder folder = db.folder().getFolder(message.folder); EntityFolder folder = db.folder().getFolder(message.folder);
if (!EntityFolder.TRASH.equals(folder.type)) if (!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.OUTBOX.equals(folder.type) &&
!EntityFolder.TRASH.equals(folder.type))
deletable = true; deletable = true;
if (!EntityFolder.SENT.equals(folder.type) && if (!EntityFolder.isOutgoing(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) && !EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type)) !EntityFolder.JUNK.equals(folder.type))
archivable = true; archivable = true;

Write Preview
Loading…
Cancel
Save