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

POP delete

This commit is contained in:
M66B 2019-02-11 21:21:06 +00:00
parent 82e7ddd8c3
commit 144bd41170
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1917,11 +1917,21 @@ public class ServiceSynchronize extends LifecycleService {
if (TextUtils.isEmpty(message.msgid)) if (TextUtils.isEmpty(message.msgid))
throw new IllegalArgumentException("Message ID missing"); throw new IllegalArgumentException("Message ID missing");
Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid)); boolean found = false;
Message[] imessages = ifolder.getMessages();
for (Message imessage : imessages) { for (Message imessage : imessages) {
Log.i(folder.name + " deleting uid=" + message.uid + " msgid=" + message.msgid); MessageHelper helper = new MessageHelper((MimeMessage) imessage);
String msgid = helper.getMessageID();
if (message.msgid.equals(msgid)) {
found = true;
imessage.setFlag(Flags.Flag.DELETED, true); imessage.setFlag(Flags.Flag.DELETED, true);
break;
} }
}
if (!found)
throw new MessageRemovedException();
ifolder.close(); ifolder.close();
ifolder.open(Folder.READ_WRITE); ifolder.open(Folder.READ_WRITE);
} }
@ -2384,6 +2394,8 @@ public class ServiceSynchronize extends LifecycleService {
List<EntityMessage> messages = db.message().getMessageByMsgId(folder.account, msgid); List<EntityMessage> messages = db.message().getMessageByMsgId(folder.account, msgid);
if (messages.size() > 0) { if (messages.size() > 0) {
for (EntityMessage message : messages)
db.message().setMessageUiHide(message.id, false);
Log.i(folder.name + " POP having=" + msgid); Log.i(folder.name + " POP having=" + msgid);
continue; continue;
} }