From 58db654a9beb1ba9636641069909a89324bc7ec1 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Thu, 18 Mar 2021 12:00:19 +0100 Subject: [PATCH] pass MessageStatus information to shard message headers (sent and seen) --- .../briar/socialbackup/SocialBackupManagerImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java index ca4c0c781..17a14c9c6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java @@ -33,6 +33,7 @@ import org.briarproject.bramble.api.sync.Group.Visibility; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.api.sync.MessageStatus; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager.ClientVersioningHook; @@ -298,6 +299,8 @@ class SocialBackupManagerImpl extends ConversationClientImpl if (meta.getLong(MSG_KEY_MESSAGE_TYPE).intValue() == SHARD.getValue()) { boolean isLocal = meta.getBoolean(MSG_KEY_LOCAL); + + MessageStatus status = db.getMessageStatus(txn, contactId, messageEntry.getKey()); long timestamp; if (isLocal) { timestamp = meta.getLong(MSG_KEY_TIMESTAMP); @@ -310,7 +313,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl new ArrayList<>(); ShardMessageHeader shardHeader = new ShardMessageHeader( messageEntry.getKey(), contactGroupId, timestamp, - isLocal, false, true, false, attachmentHeaders); + isLocal, false, status.isSent(), status.isSeen(), attachmentHeaders); headers.add(shardHeader); } }