TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-19 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into libsession-integration

Browse Source 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
This commit is contained in:
0x330a
2023-03-31 13:41:41 +11:00
parent 45ec6ac218 eb739bdc9b
commit d5e4e6b7cd
32 changed files with 328 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java
View File

@@ -319,8 +319,8 @@ public class SignalServiceDataMessage {
return this;
}
public SignalServiceDataMessage build() {
if (timestamp == 0) timestamp = System.currentTimeMillis();
public SignalServiceDataMessage build(long fallbackTimestamp) {
if (timestamp == 0) timestamp = fallbackTimestamp;
// closedGroupUpdate is always null because we don't use SignalServiceDataMessage to send them (we use ClosedGroupUpdateMessageSendJob)
return new SignalServiceDataMessage(timestamp, group, attachments, body, expiresInSeconds, expirationUpdate, profileKey, quote, sharedContacts, previews,
null, syncTarget);