Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev

4 years ago · 895bbac05b
parent 5812c8b41b c33df6fd55
commit 895bbac05b
1 changed files with 1 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@ -914,7 +914,7 @@ public class MmsDatabase extends MessagingDatabase {
      type |= Types.EXPIRATION_TIMER_UPDATE_BIT;
    }

-    return insertMessageInbox(retrieved, "", threadId, type, 0);
+    return insertMessageInbox(retrieved, "", threadId, type, serverTimestamp);
  }

  public Optional<InsertResult> insertSecureDecryptedMessageInbox(IncomingMediaMessage retrieved, long threadId)