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

Fallback to sent time when future received time

This commit is contained in:
M66B 2020-01-21 08:56:02 +01:00
parent ed5751b3b4
commit 0c76d2fe22
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ class Core {
private static final int SYNC_BATCH_SIZE = 20;
private static final int DOWNLOAD_BATCH_SIZE = 20;
private static final long YIELD_DURATION = 200L; // milliseconds
private static final long FUTURE_RECEIVED = 30 * 24 * 3600 * 1000L; // milliseconds
static void processOperations(
Context context,
@ -2071,6 +2072,16 @@ class Core {
if (message == null) {
Long sent = helper.getSent();
long received;
if (account.use_date)
received = (sent == null ? 0 : sent);
else {
received = helper.getReceived();
if (received == 0 || received > new Date().getTime() + FUTURE_RECEIVED)
if (sent != null)
received = sent;
}
String authentication = helper.getAuthentication();
MessageHelper.MessageParts parts = helper.getMessageParts(context);
@ -2108,7 +2119,7 @@ class Core {
message.content = false;
message.encrypt = parts.getEncryption();
message.ui_encrypt = message.encrypt;
message.received = (account.use_date ? (sent == null ? 0 : sent) : helper.getReceived());
message.received = received;
message.sent = sent;
message.seen = seen;
message.answered = answered;