ignore fast sender clock

Closes #5577
// FREEBIE
This commit is contained in:
Christian Ascheberg 2016-07-19 18:49:25 +02:00 committed by Moxie Marlinspike
parent 40332f57ad
commit 53e9b2ad1b

View File

@ -128,8 +128,10 @@ public abstract class MessageRecord extends DisplayRecord {
} }
public long getTimestamp() { public long getTimestamp() {
if (isPush()) return getDateSent(); if (isPush() && getDateSent() < getDateReceived()) {
else return getDateReceived(); return getDateSent();
}
return getDateReceived();
} }
public boolean isForcedSms() { public boolean isForcedSms() {