From 8478097a3ca3e33f52b29c2c4fb6013e1d6b5436 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Mon, 22 Mar 2021 08:42:25 +0100 Subject: [PATCH] test setting read flag for shard messages --- .../briar/socialbackup/SocialBackupManagerImpl.java | 6 ++++-- .../briar/socialbackup/SocialBackupIntegrationTest.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) 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 1ff5581bf..d3b514671 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 @@ -303,7 +303,8 @@ class SocialBackupManagerImpl extends ConversationClientImpl SHARD.getValue()) { boolean isLocal = meta.getBoolean(MSG_KEY_LOCAL); - MessageStatus status = db.getMessageStatus(txn, contactId, messageEntry.getKey()); + MessageStatus status = db.getMessageStatus(txn, contactId, + messageEntry.getKey()); long timestamp; if (isLocal) { timestamp = meta.getLong(MSG_KEY_TIMESTAMP); @@ -316,7 +317,8 @@ class SocialBackupManagerImpl extends ConversationClientImpl new ArrayList<>(); ShardMessageHeader shardHeader = new ShardMessageHeader( messageEntry.getKey(), contactGroupId, timestamp, - isLocal, false, status.isSent(), status.isSeen(), attachmentHeaders); + isLocal, false, status.isSent(), status.isSeen(), + attachmentHeaders); headers.add(shardHeader); } } diff --git a/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java index 1480b268e..890dfe6a1 100644 --- a/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/socialbackup/SocialBackupIntegrationTest.java @@ -138,6 +138,11 @@ public class SocialBackupIntegrationTest assertGroupCount(messageTracker0, g2From0.getId(), 1, 0); assertGroupCount(messageTracker1, g0From1.getId(), 1, 1); assertGroupCount(messageTracker2, g0From2.getId(), 1, 1); + + // mark a message as read + socialBackupManager1.setReadFlag(g0From1.getId(), + messages0At1.iterator().next().getId(), true); + assertGroupCount(messageTracker1, g0From1.getId(), 1, 0); } private Collection getMessages1At0()