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

Fix seen after move

This commit is contained in:
M66B 2019-02-02 12:23:35 +00:00
parent 7e2479d138
commit ac02d5989e
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1733,23 +1733,20 @@ public class ServiceSynchronize extends LifecycleService {
imessage.setFlag(Flags.Flag.DRAFT, true); imessage.setFlag(Flags.Flag.DRAFT, true);
// Add message // Add message
long uid;
if (istore.hasCapability("UIDPLUS")) { if (istore.hasCapability("UIDPLUS")) {
Log.i(folder.name + " append uid id=" + message.id); Log.i(folder.name + " append uid id=" + message.id);
AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage}); AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
if (uids == null || uids.length == 0) if (uids == null || uids.length == 0)
throw new MessageRemovedException("Message not appended"); throw new MessageRemovedException("Message not appended");
Log.i(folder.name + " appended uid=" + uids[0].uid); uid = uids[0].uid;
db.message().setMessageUid(message.id, uids[0].uid);
} else { } else {
Log.i(folder.name + " append id=" + message.id); Log.i(folder.name + " append id=" + message.id);
ifolder.appendMessages(new Message[]{imessage}); ifolder.appendMessages(new Message[]{imessage});
uid = getUid(folder, ifolder, message.msgid);
Log.i(folder.name + " lookup id=" + message.id);
long uid = getUid(folder, ifolder, message.msgid);
Log.i(folder.name + " lookup id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
} }
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
if (folder.id.equals(message.folder)) { if (folder.id.equals(message.folder)) {
// Delete previous message // Delete previous message
@ -1836,7 +1833,29 @@ public class ServiceSynchronize extends LifecycleService {
icopy.setFlag(Flags.Flag.DRAFT, true); icopy.setFlag(Flags.Flag.DRAFT, true);
// Append target // Append target
itarget.appendMessages(new Message[]{icopy}); long uid;
if (istore.hasCapability("UIDPLUS")) {
Log.i(folder.name + " move/append uid id=" + message.id);
AppendUID[] uids = itarget.appendUIDMessages(new Message[]{icopy});
if (uids == null || uids.length == 0)
throw new MessageRemovedException("Message not move/appended");
uid = uids[0].uid;
} else {
Log.i(folder.name + " move/append id=" + message.id);
itarget.appendMessages(new Message[]{icopy});
uid = getUid(target, itarget, message.msgid);
}
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
if (itarget.getPermanentFlags().contains(Flags.Flag.SEEN)) {
boolean seen = (autoread || message.ui_seen);
icopy = itarget.getMessageByUID(uid);
if (seen != icopy.isSet(Flags.Flag.SEEN)) {
Log.i(folder.name + " Fixing id=" + message.id + " seen=" + seen);
icopy.setFlag(Flags.Flag.SEEN, seen);
}
}
// Delete source // Delete source
imessage.setFlag(Flags.Flag.DELETED, true); imessage.setFlag(Flags.Flag.DELETED, true);