From d24c0f3e42412222dceb754e5fef9a514530728f Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 22 Dec 2018 13:16:32 +0000 Subject: [PATCH] Prevent deleting outbox messages --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index f33ed29697..39b50c80a7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -637,7 +637,7 @@ public class FragmentMessages extends FragmentEx { for (EntityMessage threaded : messages) { EntityFolder folder = db.folder().getFolder(threaded.folder); if (!result.target.id.equals(threaded.folder) && - !EntityFolder.SENT.equals(folder.type) && + !EntityFolder.isOutgoing(folder.type) && !EntityFolder.TRASH.equals(folder.type) && !EntityFolder.JUNK.equals(folder.type)) result.ids.add(threaded.id); @@ -1348,9 +1348,11 @@ public class FragmentMessages extends FragmentEx { boolean archivable = false; for (EntityMessage message : messages) { 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; - if (!EntityFolder.SENT.equals(folder.type) && + if (!EntityFolder.isOutgoing(folder.type) && !EntityFolder.TRASH.equals(folder.type) && !EntityFolder.JUNK.equals(folder.type)) archivable = true;