Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-04-19 06:24:34 +02:00
Code Issues Projects Releases Wiki Activity

Don't check whether messages are visible before lowering ack flag.

Browse Source 
This check excludes messages that aren't shared, including incoming private messages. The check isn't necessary because lowerAckFlag() ignores messages for which no status row exists for the contact.
This commit is contained in:
akwizgran
2022-08-05 14:11:23 +01:00
parent 217a6dbf1c
commit 15d29f6189
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java
+1 -5
View File
@@ -1099,11 +1099,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
T txn = unbox(transaction); T txn = unbox(transaction);
if (!db.containsContact(txn, c)) if (!db.containsContact(txn, c))
throw new NoSuchContactException(); throw new NoSuchContactException();
List<MessageId> visible = new ArrayList<>(acked.size()); db.lowerAckFlag(txn, c, acked);
for (MessageId m : acked) {
if (db.containsVisibleMessage(txn, c, m)) visible.add(m);
}
db.lowerAckFlag(txn, c, visible);
} }
@Override @Override
bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java
+1 -8
View File
@@ -1396,14 +1396,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
will(returnValue(txn)); will(returnValue(txn));
oneOf(database).containsContact(txn, contactId); oneOf(database).containsContact(txn, contactId);
will(returnValue(true)); will(returnValue(true));
// First message is still visible to the contact - flag lowered oneOf(database).lowerAckFlag(txn, contactId, acked);
oneOf(database).containsVisibleMessage(txn, contactId, messageId);
will(returnValue(true));
// Second message is no longer visible - flag not lowered
oneOf(database).containsVisibleMessage(txn, contactId, messageId1);
will(returnValue(false));
oneOf(database)
.lowerAckFlag(txn, contactId, singletonList(messageId));
oneOf(database).commitTransaction(txn); oneOf(database).commitTransaction(txn);
}}); }});
DatabaseComponent db = createDatabaseComponent(database, eventBus, DatabaseComponent db = createDatabaseComponent(database, eventBus,