From d28f8bedc2ee0d8f6eb3b8bcf382b7ec23220b7c Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 3 Oct 2019 17:29:54 +0200 Subject: [PATCH] Fixed POP3 delete --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index f96bb2e379..36b492c3ba 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3992,6 +3992,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (message == null) return null; + EntityAccount account = db.account().getAccount(message.account); + if (account == null) + return null; + EntityFolder folder = db.folder().getFolder(message.folder); if (folder == null) return null; @@ -4006,7 +4010,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); nm.cancel("send:" + message.identity, 1); } - } else if (message.uid == null) { + } else if (message.uid == null && !account.pop) { db.message().deleteMessage(id); db.folder().setFolderError(message.folder, null); } else