mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Always hide deleted POP3 messages

This commit is contained in:
M66B 2020-05-05 18:03:14 +02:00
parent 099c08ba26
commit 6c6e260be8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/Core.java
View File

@ -1053,9 +1053,7 @@ class Core {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
if (EntityFolder.INBOX.equals(folder.type)) { if (EntityFolder.INBOX.equals(folder.type)) {
if (account.leave_deleted) if (!account.leave_deleted) {
db.message().setMessageUiHide(message.id, true);
else {
Map<String, String> caps = istore.capabilities(); Map<String, String> caps = istore.capabilities();
Message[] imessages = ifolder.getMessages(); Message[] imessages = ifolder.getMessages();
@ -1080,20 +1078,20 @@ class Core {
} }
} }
Log.i(folder.name + " POP expunge=" + found); if (found) {
if (found)
try { try {
Log.i(folder.name + " POP expunge=" + found);
ifolder.close(true); ifolder.close(true);
ifolder.open(Folder.READ_WRITE); ifolder.open(Folder.READ_WRITE);
db.message().deleteMessage(folder.id, message.id);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
state.error(new FolderClosedException(ifolder, "POP")); 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 } else
db.message().deleteMessage(folder.id, message.id); db.message().deleteMessage(folder.id, message.id);