Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent deleting outbox messages

Browse Source
This commit is contained in:
M66B
2018-12-22 13:16:32 +00:00
parent cc69cbe9ab
commit d24c0f3e42
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;