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

Use IMAP MOVE when available

This commit is contained in:
M66B 2020-08-07 20:49:27 +02:00
parent 86861c9bfe
commit 0623cd5dd2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,6 +953,8 @@ class Core {
db.message().deleteMessage(message.id); db.message().deleteMessage(message.id);
} }
boolean canMove = istore.hasCapability("MOVE");
// Some providers do not support the COPY operation for drafts // Some providers do not support the COPY operation for drafts
boolean draft = (EntityFolder.DRAFTS.equals(folder.type) || EntityFolder.DRAFTS.equals(target.type)); boolean draft = (EntityFolder.DRAFTS.equals(folder.type) || EntityFolder.DRAFTS.equals(target.type));
if (draft) { if (draft) {
@ -986,7 +988,7 @@ class Core {
itarget.appendMessages(icopies.toArray(new Message[0])); itarget.appendMessages(icopies.toArray(new Message[0]));
} else { } else {
for (Message imessage : map.keySet()) { for (Message imessage : map.keySet()) {
Log.i("Move seen=" + seen + " unflag=" + unflag + " flags=" + imessage.getFlags()); Log.i("Move seen=" + seen + " unflag=" + unflag + " flags=" + imessage.getFlags() + " can=" + canMove);
// Mark read // Mark read
if (seen && flags.contains(Flags.Flag.SEEN)) if (seen && flags.contains(Flags.Flag.SEEN))
@ -997,11 +999,15 @@ class Core {
imessage.setFlag(Flags.Flag.FLAGGED, false); imessage.setFlag(Flags.Flag.FLAGGED, false);
} }
ifolder.copyMessages(map.keySet().toArray(new Message[0]), itarget); // https://tools.ietf.org/html/rfc6851
if (!copy && canMove)
ifolder.moveMessages(map.keySet().toArray(new Message[0]), itarget);
else
ifolder.copyMessages(map.keySet().toArray(new Message[0]), itarget);
} }
// Delete source // Delete source
if (!copy) { if (!copy && (draft || !canMove)) {
try { try {
for (Message imessage : map.keySet()) for (Message imessage : map.keySet())
imessage.setFlag(Flags.Flag.DELETED, true); imessage.setFlag(Flags.Flag.DELETED, true);