mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-15 08:29:24 +00:00
Code Issues Releases Wiki Activity

Fixed moving messages without ID and UIDPLUS

Browse source
This commit is contained in:
M66B 2019-02-17 10:23:17 +00:00
parent 2f9d4c7ebb
commit b0492af20e
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/MimeMessageEx.java
View file

@ -19,6 +19,8 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import java.io.InputStream;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
@ -31,9 +33,21 @@ public class MimeMessageEx extends MimeMessage {
this.msgid = msgid;
}
MimeMessageEx(Session session, InputStream is, String msgid) throws MessagingException {
super(session, is);
this.msgid = msgid;
}
public String getMsgid() throws MessagingException {
if (this.msgid == null)
return super.getMessageID();
else
return this.msgid;
}
@Override
protected void updateMessageID() throws MessagingException {
if (msgid == null)
if (this.msgid == null)
super.updateMessageID();
else {
setHeader("Message-ID", msgid);

32
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View file

@ -1772,7 +1772,7 @@ public class ServiceSynchronize extends LifecycleService {
imessage.setFlag(Flags.Flag.DRAFT, true);
// Add message
long uid = append(istore, ifolder, imessage, message.msgid);
long uid = append(istore, ifolder, imessage);
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
@ -1822,10 +1822,9 @@ public class ServiceSynchronize extends LifecycleService {
!EntityFolder.DRAFTS.equals(folder.type) &&
!EntityFolder.DRAFTS.equals(target.type)) {
// Autoread
if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN)) {
if (ifolder.getPermanentFlags().contains(Flags.Flag.SEEN))
if (autoread && !imessage.isSet(Flags.Flag.SEEN))
imessage.setFlag(Flags.Flag.SEEN, true);
}
// Move message to
ifolder.moveMessages(new Message[]{imessage}, itarget);
@ -1838,20 +1837,23 @@ public class ServiceSynchronize extends LifecycleService {
imessage.writeTo(bos);
// Deserialize target message
// Make sure the message has a message ID
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
Message icopy = new MimeMessage(isession, bis);
String msgid = message.msgid;
if (msgid == null) {
msgid = EntityMessage.generateMessageId();
Log.i(target.name + " generated message id=" + msgid);
}
Message icopy = new MimeMessageEx(isession, bis, msgid);
try {
// Needed to read flags
itarget.open(Folder.READ_WRITE);
// Auto read
if (itarget.getPermanentFlags().contains(Flags.Flag.SEEN)) {
if (autoread && !icopy.isSet(Flags.Flag.SEEN)) {
Log.i("Copy autoread");
if (itarget.getPermanentFlags().contains(Flags.Flag.SEEN))
if (autoread && !icopy.isSet(Flags.Flag.SEEN))
icopy.setFlag(Flags.Flag.SEEN, true);
}
}
// Move from drafts
if (EntityFolder.DRAFTS.equals(folder.type))
@ -1864,8 +1866,8 @@ public class ServiceSynchronize extends LifecycleService {
icopy.setFlag(Flags.Flag.DRAFT, true);
// Append target
long uid = append(istore, itarget, icopy, message.msgid);
Log.i(folder.name + " appended id=" + message.id + " uid=" + uid);
long uid = append(istore, itarget, (MimeMessage) icopy);
Log.i(target.name + " appended id=" + message.id + " uid=" + uid);
db.message().setMessageUid(message.id, uid);
// Some providers, like Gmail, don't honor the appended seen flag
@ -1873,7 +1875,7 @@ public class ServiceSynchronize extends LifecycleService {
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);
Log.i(target.name + " Fixing id=" + message.id + " seen=" + seen);
icopy.setFlag(Flags.Flag.SEEN, seen);
}
}
@ -1883,7 +1885,7 @@ public class ServiceSynchronize extends LifecycleService {
boolean draft = EntityFolder.DRAFTS.equals(target.type);
icopy = itarget.getMessageByUID(uid);
if (draft != icopy.isSet(Flags.Flag.DRAFT)) {
Log.i(folder.name + " Fixing id=" + message.id + " draft=" + draft);
Log.i(target.name + " Fixing id=" + message.id + " draft=" + draft);
icopy.setFlag(Flags.Flag.DRAFT, draft);
}
}
@ -2174,7 +2176,7 @@ public class ServiceSynchronize extends LifecycleService {
parts.downloadAttachment(this, db, attachment.id, sequence);
}
private long append(IMAPStore istore, IMAPFolder ifolder, Message imessage, String msgid) throws MessagingException {
private long append(IMAPStore istore, IMAPFolder ifolder, MimeMessage imessage) throws MessagingException {
if (istore.hasCapability("UIDPLUS")) {
AppendUID[] uids = ifolder.appendUIDMessages(new Message[]{imessage});
if (uids == null || uids.length == 0)
@ -2183,7 +2185,7 @@ public class ServiceSynchronize extends LifecycleService {
} else {
ifolder.appendMessages(new Message[]{imessage});
long uid = -1;
Message[] messages = ifolder.search(new MessageIDTerm(msgid));
Message[] messages = ifolder.search(new MessageIDTerm(imessage.getMessageID()));
if (messages != null)
for (Message iappended : messages) {
long muid = ifolder.getUID(iappended);