Delete fetched/removed messages

3 years ago · 126da6e63c
parent 84f8b9c213
commit 126da6e63c
1 changed files with 10 additions and 4 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -618,10 +618,16 @@ class Core {
                                db.operation().deleteOperation(op.id);

                                // Cleanup messages
-                                if (message != null &&
-                                        MessageHelper.isRemoved(ex) &&
-                                        !EntityOperation.SEEN.equals(op.name))
-                                    db.message().deleteMessage(message.id);
+                                if (MessageHelper.isRemoved(ex)) {
+                                    if (message != null &&
+                                            !EntityOperation.SEEN.equals(op.name))
+                                        db.message().deleteMessage(message.id);
+
+                                    if (EntityOperation.FETCH.equals(op.name)) {
+                                        long uid = jargs.getLong(0);
+                                        db.message().deleteMessage(folder.id, uid);
+                                    }
+                                }

                                db.setTransactionSuccessful();
                            } finally {