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

Delete messages without ID by uid

This commit is contained in:
M66B 2019-04-11 13:02:56 +02:00
parent f42d624285
commit 19a407cf31
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,10 +544,15 @@ class Core {
// Delete message // Delete message
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
Message[] imessages;
if (TextUtils.isEmpty(message.msgid)) if (TextUtils.isEmpty(message.msgid))
throw new IllegalArgumentException("Message ID missing"); if (message.uid == null)
throw new IllegalArgumentException("Delete without ID");
else
imessages = new Message[]{ifolder.getMessageByUID(message.uid)};
else
imessages = ifolder.search(new MessageIDTerm(message.msgid));
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
for (Message imessage : imessages) { for (Message imessage : imessages) {
Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid); Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid);
try { try {
@ -555,6 +560,7 @@ class Core {
} catch (MessageRemovedException ignored) { } catch (MessageRemovedException ignored) {
} }
} }
ifolder.expunge(); ifolder.expunge();
db.message().deleteMessage(message.id); db.message().deleteMessage(message.id);