Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 00:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use extra header to find messages again

Browse Source
This commit is contained in:
M66B
2018-11-30 12:58:25 +01:00
parent f97328f725
commit 7048bf0e56
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -187,6 +187,7 @@ public class MessageHelper {
imessage.addHeader("References", (replying.references == null ? "" : replying.references + " ") + replying.msgid);
}
imessage.addHeader("X-FairEmail-ID", message.msgid);
imessage.addHeader("X-FairEmail-Thread", message.thread);
imessage.setFlag(Flags.Flag.SEEN, message.seen);
@@ -368,6 +369,11 @@ public class MessageHelper {
}
String getMessageID() throws MessagingException {
// Outlook outbox -> sent
String[] xID = imessage.getHeader("X-FairEmail-ID");
if (xID != null && xID.length > 0)
return xID[0];
return imessage.getHeader("Message-ID", null);
}
@@ -385,6 +391,7 @@ public class MessageHelper {
}
String getThreadId(long uid) throws MessagingException {
// Some providers break references when moving messages
String[] xThread = imessage.getHeader("X-FairEmail-Thread");
if (xThread != null && xThread.length > 0)
return xThread[0];
@@ -392,6 +399,7 @@ public class MessageHelper {
for (String ref : getReferences())
if (!TextUtils.isEmpty(ref))
return ref;
String msgid = getMessageID();
return (TextUtils.isEmpty(msgid) ? Long.toString(uid) : msgid);
}