TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore fast sender clock

Browse Source 
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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/database/model/MessageRecord.java
View File

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