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

Use db directly, get rid of injected ContactManager

Browse Source
This commit is contained in:
Daniel Lublin
2022-04-01 10:31:52 +02:00
parent bf968b227e
commit 44fb2a5c59
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImpl.java
View File

@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.client.ClientHelper;
import org.briarproject.bramble.api.client.ContactGroupFactory; import org.briarproject.bramble.api.client.ContactGroupFactory;
import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.contact.ContactManager.ContactHook; import org.briarproject.bramble.api.contact.ContactManager.ContactHook;
import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfDictionary;
@@ -56,7 +55,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
private final ContactGroupFactory contactGroupFactory; private final ContactGroupFactory contactGroupFactory;
private final Clock clock; private final Clock clock;
private final MailboxSettingsManager mailboxSettingsManager; private final MailboxSettingsManager mailboxSettingsManager;
private final ContactManager contactManager;
private final CryptoComponent crypto; private final CryptoComponent crypto;
private final Group localGroup; private final Group localGroup;
@@ -66,7 +64,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
MetadataParser metadataParser, MetadataParser metadataParser,
ContactGroupFactory contactGroupFactory, Clock clock, ContactGroupFactory contactGroupFactory, Clock clock,
MailboxSettingsManager mailboxSettingsManager, MailboxSettingsManager mailboxSettingsManager,
ContactManager contactManager,
CryptoComponent crypto) { CryptoComponent crypto) {
this.db = db; this.db = db;
this.clientHelper = clientHelper; this.clientHelper = clientHelper;
@@ -75,7 +72,6 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
this.contactGroupFactory = contactGroupFactory; this.contactGroupFactory = contactGroupFactory;
this.clock = clock; this.clock = clock;
this.mailboxSettingsManager = mailboxSettingsManager; this.mailboxSettingsManager = mailboxSettingsManager;
this.contactManager = contactManager;
this.crypto = crypto; this.crypto = crypto;
localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID, localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID,
MAJOR_VERSION); MAJOR_VERSION);
@@ -120,14 +116,14 @@ class MailboxPropertyManagerImpl implements MailboxPropertyManager,
@Override @Override
public void mailboxPaired(Transaction txn, String ownOnion) public void mailboxPaired(Transaction txn, String ownOnion)
throws DbException { throws DbException {
for (Contact c : contactManager.getContacts()) { for (Contact c : db.getContacts(txn)) {
createAndSendProperties(txn, c, ownOnion); createAndSendProperties(txn, c, ownOnion);
} }
} }
@Override @Override
public void mailboxUnpaired(Transaction txn) throws DbException { public void mailboxUnpaired(Transaction txn) throws DbException {
for (Contact c : contactManager.getContacts()) { for (Contact c : db.getContacts(txn)) {
sendEmptyProperties(txn, c); sendEmptyProperties(txn, c);
} }
} }

9
bramble-core/src/test/java/org/briarproject/bramble/mailbox/MailboxPropertyManagerImplTest.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.bramble.mailbox;
import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.client.ClientHelper;
import org.briarproject.bramble.api.client.ContactGroupFactory; import org.briarproject.bramble.api.client.ContactGroupFactory;
import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoComponent;
import org.briarproject.bramble.api.data.BdfDictionary; import org.briarproject.bramble.api.data.BdfDictionary;
import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.data.BdfEntry;
@@ -68,8 +67,6 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
private final CryptoComponent crypto = context.mock(CryptoComponent.class); private final CryptoComponent crypto = context.mock(CryptoComponent.class);
private final MailboxSettingsManager mailboxSettingsManager = private final MailboxSettingsManager mailboxSettingsManager =
context.mock(MailboxSettingsManager.class); context.mock(MailboxSettingsManager.class);
private final ContactManager contactManager =
context.mock(ContactManager.class);
private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION); private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
private final BdfDictionary propsDict; private final BdfDictionary propsDict;
@@ -99,7 +96,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
}}); }});
return new MailboxPropertyManagerImpl(db, clientHelper, return new MailboxPropertyManagerImpl(db, clientHelper,
clientVersioningManager, metadataParser, contactGroupFactory, clientVersioningManager, metadataParser, contactGroupFactory,
clock, mailboxSettingsManager, contactManager, crypto); clock, mailboxSettingsManager, crypto);
} }
@Test @Test
@@ -423,7 +420,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
)); ));
context.checking(new Expectations() {{ context.checking(new Expectations() {{
oneOf(contactManager).getContacts(); oneOf(db).getContacts(txn);
will(returnValue(contacts)); will(returnValue(contacts));
oneOf(crypto).generateUniqueId(); oneOf(crypto).generateUniqueId();
will(returnValue(props.getAuthToken())); will(returnValue(props.getAuthToken()));
@@ -466,7 +463,7 @@ public class MailboxPropertyManagerImplTest extends BrambleMockTestCase {
)); ));
context.checking(new Expectations() {{ context.checking(new Expectations() {{
oneOf(contactManager).getContacts(); oneOf(db).getContacts(txn);
will(returnValue(contacts)); will(returnValue(contacts));
oneOf(contactGroupFactory).createContactGroup(CLIENT_ID, oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
MAJOR_VERSION, contact); MAJOR_VERSION, contact);