mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 20:29:52 +01:00
Small code cleanups.
This commit is contained in:
@@ -432,22 +432,20 @@ class IntroduceeProtocolEngine
|
||||
|
||||
Map<TransportId, TransportKeySetId> keys = null;
|
||||
try {
|
||||
contactManager
|
||||
.addContact(txn, s.getRemote().author, localAuthor.getId(),
|
||||
false);
|
||||
contactManager.addContact(txn, s.getRemote().author,
|
||||
localAuthor.getId(), false);
|
||||
|
||||
// Only add transport properties and keys when the contact was added
|
||||
// This will be changed once we have a way to reset state for peers
|
||||
// that were contacts already at some point in the past.
|
||||
Contact c = contactManager
|
||||
.getContact(txn, s.getRemote().author.getId(),
|
||||
localAuthor.getId());
|
||||
Contact c = contactManager.getContact(txn,
|
||||
s.getRemote().author.getId(), localAuthor.getId());
|
||||
|
||||
// add the keys to the new contact
|
||||
//noinspection ConstantConditions
|
||||
keys = keyManager
|
||||
.addContact(txn, c.getId(), new SecretKey(s.getMasterKey()),
|
||||
timestamp, s.getLocal().alice, false);
|
||||
keys = keyManager.addContact(txn, c.getId(),
|
||||
new SecretKey(s.getMasterKey()), timestamp,
|
||||
s.getLocal().alice, false);
|
||||
|
||||
// add signed transport properties for the contact
|
||||
//noinspection ConstantConditions
|
||||
|
||||
@@ -91,8 +91,7 @@ public class BlogManagerImplTest extends BriarTestCase {
|
||||
public BlogManagerImplTest() {
|
||||
MetadataParser metadataParser = context.mock(MetadataParser.class);
|
||||
blogManager = new BlogManagerImpl(db, contactManager, identityManager,
|
||||
clientHelper,
|
||||
metadataParser, blogFactory, blogPostFactory);
|
||||
clientHelper, metadataParser, blogFactory, blogPostFactory);
|
||||
|
||||
localAuthor1 = getLocalAuthor();
|
||||
localAuthor2 = getLocalAuthor();
|
||||
|
||||
Reference in New Issue
Block a user