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

POP3: get received time before resend time

Browse Source
This commit is contained in:
M66B
2021-08-20 09:07:38 +02:00
parent c820e15a42
commit c085fcacf7
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1557,6 +1557,10 @@ public class MessageHelper {
}
Long getReceivedHeader() throws MessagingException {
return getReceivedHeader(null);
}
Long getReceivedHeader(Long before) throws MessagingException {
ensureHeaders();
// https://tools.ietf.org/html/rfc5321#section-4.4
@@ -1565,17 +1569,24 @@ public class MessageHelper {
if (received == null || received.length == 0)
return null;
String last = MimeUtility.unfold(received[0]);
int semi = last.lastIndexOf(';');
if (semi < 0)
return null;
// First header is last added header
for (int i = 0; i < received.length; i++) {
String header = MimeUtility.unfold(received[i]);
int semi = header.lastIndexOf(';');
if (semi < 0)
return null;
MailDateFormat mdf = new MailDateFormat();
Date date = mdf.parse(last, new ParsePosition(semi + 1));
if (date == null)
return null;
MailDateFormat mdf = new MailDateFormat();
Date date = mdf.parse(header, new ParsePosition(semi + 1));
if (date == null)
return null;
return date.getTime();
long time = date.getTime();
if (before == null || time < before)
return time;
}
return null;
}
Long getSent() throws MessagingException {
@@ -1588,6 +1599,21 @@ public class MessageHelper {
return sent.getTime();
}
Long getResent() throws MessagingException {
ensureHeaders();
String resent = imessage.getHeader("Resent-Date", null);
if (resent == null)
return null;
MailDateFormat mdf = new MailDateFormat();
Date date = mdf.parse(resent, new ParsePosition(0));
if (date == null)
return null;
return date.getTime();
}
String getHeaders() throws MessagingException {
ensureHeaders();