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

Use event instead of CommitAction to handle removed PendingContacts

Browse Source
This commit is contained in:
Torsten Grote
2019-05-09 11:43:22 -03:00
parent 19bc73ac61
commit fbe375cc4e
7 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
View File

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.contact.PendingContact;
import org.briarproject.bramble.api.contact.PendingContactId;
import org.briarproject.bramble.api.contact.event.ContactAddedRemotelyEvent;
import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.db.DatabaseComponent;
@@ -218,8 +219,7 @@ class ContactManagerImpl implements ContactManager {
}
@Override
public void removePendingContact(PendingContactId id,
Runnable commitAction) throws DbException {
public void removePendingContact(PendingContactId id) throws DbException {
// TODO replace with real implementation
for (PendingContact pc : pendingContacts) {
if (pc.getId().equals(id)) {
@@ -231,7 +231,8 @@ class ContactManagerImpl implements ContactManager {
Thread.sleep(250);
} catch (InterruptedException ignored) {
}
db.transaction(true, txn -> txn.attach(commitAction));
db.transaction(true,
txn -> txn.attach(new PendingContactRemovedEvent(id)));
}
@Override