Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

add read flag to shard message header

Browse Source
This commit is contained in:
ameba23
2021-03-22 16:13:08 +01:00
parent d47c18b392
commit b1f5d71a4e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java
View File

@@ -42,8 +42,6 @@ import org.briarproject.briar.api.client.MessageTracker;
import org.briarproject.briar.api.conversation.ConversationManager; import org.briarproject.briar.api.conversation.ConversationManager;
import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.ConversationMessageHeader;
import org.briarproject.briar.api.conversation.DeletionResult; import org.briarproject.briar.api.conversation.DeletionResult;
import org.briarproject.briar.api.privategroup.PrivateGroup;
import org.briarproject.briar.api.privategroup.event.GroupInvitationRequestReceivedEvent;
import org.briarproject.briar.api.socialbackup.BackupExistsException; import org.briarproject.briar.api.socialbackup.BackupExistsException;
import org.briarproject.briar.api.socialbackup.BackupMetadata; import org.briarproject.briar.api.socialbackup.BackupMetadata;
import org.briarproject.briar.api.socialbackup.DarkCrystal; import org.briarproject.briar.api.socialbackup.DarkCrystal;
@@ -66,6 +64,7 @@ import javax.inject.Inject;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
import static org.briarproject.briar.socialbackup.MessageType.BACKUP; import static org.briarproject.briar.socialbackup.MessageType.BACKUP;
import static org.briarproject.briar.socialbackup.MessageType.SHARD; import static org.briarproject.briar.socialbackup.MessageType.SHARD;
import static org.briarproject.briar.socialbackup.SocialBackupConstants.GROUP_KEY_CONTACT_ID; import static org.briarproject.briar.socialbackup.SocialBackupConstants.GROUP_KEY_CONTACT_ID;
@@ -180,6 +179,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl
protected boolean incomingMessage(Transaction txn, Message m, BdfList body, protected boolean incomingMessage(Transaction txn, Message m, BdfList body,
BdfDictionary meta) throws DbException, FormatException { BdfDictionary meta) throws DbException, FormatException {
MessageType type = MessageType.fromValue(body.getLong(0).intValue()); MessageType type = MessageType.fromValue(body.getLong(0).intValue());
System.out.println("GOT INCOMING DC MESSAGE");
if (type == SHARD) { if (type == SHARD) {
// Only one shard should be received from each contact // Only one shard should be received from each contact
if (findMessage(txn, m.getGroupId(), SHARD, false) != null) { if (findMessage(txn, m.getGroupId(), SHARD, false) != null) {
@@ -298,7 +298,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl
throws FormatException { throws FormatException {
boolean isLocal = meta.getBoolean(MSG_KEY_LOCAL); boolean isLocal = meta.getBoolean(MSG_KEY_LOCAL);
boolean read = meta.getBoolean(MSG_KEY_READ, false);
long timestamp; long timestamp;
if (isLocal) { if (isLocal) {
timestamp = meta.getLong(MSG_KEY_TIMESTAMP); timestamp = meta.getLong(MSG_KEY_TIMESTAMP);
@@ -309,7 +309,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl
new ArrayList<>(); new ArrayList<>();
return new ShardMessageHeader( return new ShardMessageHeader(
message.getId(), message.getGroupId(), timestamp, message.getId(), message.getGroupId(), timestamp,
isLocal, false, status.isSent(), status.isSeen(), isLocal, read, status.isSent(), status.isSeen(),
attachmentHeaders); attachmentHeaders);
} }