Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

DatabaseComponent.setSeen() should call setStatusSeenIfVisible().

Browse Source 
Otherwise an exception may be thrown if an offered message is no
longer in the DB.
This commit is contained in:
akwizgran
2011-09-25 14:39:31 +01:00
parent 98ab523092
commit 124188a0a1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -1163,7 +1163,7 @@ DatabaseCleaner.Callback {
T txn = db.startTransaction(); T txn = db.startTransaction();
try { try {
for(MessageId m : seen) { for(MessageId m : seen) {
db.setStatus(txn, c, m, Status.SEEN); db.setStatusSeenIfVisible(txn, c, m);
} }
db.commitTransaction(txn); db.commitTransaction(txn);
} catch(DbException e) { } catch(DbException e) {

2
test/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -1509,7 +1509,7 @@ public abstract class DatabaseComponentTest extends TestCase {
allowing(database).containsContact(txn, contactId); allowing(database).containsContact(txn, contactId);
will(returnValue(true)); will(returnValue(true));
// setSeen(contactId, Collections.singleton(messageId)) // setSeen(contactId, Collections.singleton(messageId))
oneOf(database).setStatus(txn, contactId, messageId, Status.SEEN); oneOf(database).setStatusSeenIfVisible(txn, contactId, messageId);
}}); }});
DatabaseComponent db = createDatabaseComponent(database, cleaner); DatabaseComponent db = createDatabaseComponent(database, cleaner);