Delete instead of trash drafts set to encrypt

5 years ago · e7d3716084
parent f4b96bc5fe
commit e7d3716084
1 changed files with 6 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@ -118,6 +118,12 @@ public class EntityOperation {
            for (Object value : values)
                jargs.put(value);

+            if (MOVE.equals(name) && message.encrypt != null && message.encrypt) {
+                EntityFolder folder = db.folder().getFolder(message.folder);
+                if (folder != null && EntityFolder.DRAFTS.equals(folder.type))
+                    name = DELETE;
+            }
+
            if (SEEN.equals(name)) {
                boolean seen = jargs.getBoolean(0);
                boolean ignore = jargs.optBoolean(1, true);