From 56fb20f2579c9ae65b481506023780af99cd3672 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 18 Apr 2019 13:42:59 +0100
Subject: [PATCH] Small code cleanups.

---
 .../bramble/transport/KeyManagerImplTest.java    |  2 +-
 .../reveal/RevealContactsControllerImpl.java     |  6 ++----
 .../introduction/IntroduceeProtocolEngine.java   | 16 +++++++---------
 .../briar/blog/BlogManagerImplTest.java          |  3 +--
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java
index d68a7a31b..8e78d5e56 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java
@@ -141,7 +141,7 @@ public class KeyManagerImplTest extends BrambleMockTestCase {
 	public void testContactRemovedEvent() {
 		ContactRemovedEvent event = new ContactRemovedEvent(contactId);
 
-		context.checking(new DbExpectations() {{
+		context.checking(new Expectations() {{
 			oneOf(transportKeyManager).removeContact(contactId);
 		}});
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java
index 7ae0b2bad..f8c1fe1d7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java
@@ -75,10 +75,8 @@ class RevealContactsControllerImpl extends DbControllerImpl
 	@DatabaseExecutor
 	private Collection<RevealableContactItem> getItems(GroupId g,
 			Collection<ContactId> selection) throws DbException {
-		Collection<GroupMember> members =
-				groupManager.getMembers(g);
-		Collection<Contact> contacts =
-				contactManager.getContacts();
+		Collection<GroupMember> members = groupManager.getMembers(g);
+		Collection<Contact> contacts = contactManager.getContacts();
 		Collection<RevealableContactItem> items =
 				new ArrayList<>(members.size());
 		for (GroupMember m : members) {
diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
index 361856039..ba64155b3 100644
--- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
+++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java
@@ -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
diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
index bf79dcf85..b4bf5c6fe 100644
--- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
+++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
@@ -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();