From 6c6e260be8c990a8ec221345d53cdd0ae9e3262e Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 5 May 2020 18:03:14 +0200 Subject: [PATCH] Always hide deleted POP3 messages --- app/src/main/java/eu/faircode/email/Core.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 31740f1424..114e94f66b 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1053,9 +1053,7 @@ class Core { DB db = DB.getInstance(context); if (EntityFolder.INBOX.equals(folder.type)) { - if (account.leave_deleted) - db.message().setMessageUiHide(message.id, true); - else { + if (!account.leave_deleted) { Map caps = istore.capabilities(); Message[] imessages = ifolder.getMessages(); @@ -1080,20 +1078,20 @@ class Core { } } - Log.i(folder.name + " POP expunge=" + found); - - if (found) + if (found) { try { + Log.i(folder.name + " POP expunge=" + found); ifolder.close(true); ifolder.open(Folder.READ_WRITE); - db.message().deleteMessage(folder.id, message.id); } catch (Throwable ex) { Log.e(ex); state.error(new FolderClosedException(ifolder, "POP")); } - else - db.message().deleteMessage(folder.id, message.id); + } } + + // Synchronize will delete messages when needed + db.message().setMessageUiHide(message.id, true); } else db.message().deleteMessage(folder.id, message.id);