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

This commit is contained in:
nielsandriesse 2020-09-25 09:51:37 +10:00
commit 895bbac05b

View File

@ -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)