mirror of
https://github.com/oxen-io/session-android.git
synced 2025-01-12 17:43:38 +00:00
Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev
This commit is contained in:
commit
895bbac05b
@ -914,7 +914,7 @@ public class MmsDatabase extends MessagingDatabase {
|
|||||||
type |= Types.EXPIRATION_TIMER_UPDATE_BIT;
|
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)
|
public Optional<InsertResult> insertSecureDecryptedMessageInbox(IncomingMediaMessage retrieved, long threadId)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user