diff --git a/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java b/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java index 5380652c6d84dccb25ef4cab8c9a2ea837d5144d..e8d0b5e2f7e8633fba85b00d79e21af9ddd0847d 100644 --- a/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java +++ b/briar-core/src/org/briarproject/clients/BdfIncomingMessageHook.java @@ -24,7 +24,7 @@ public abstract class BdfIncomingMessageHook implements IncomingMessageHook, protected final MetadataParser metadataParser; protected BdfIncomingMessageHook(ClientHelper clientHelper, - MetadataParser metadataParser, Clock clock) { + MetadataParser metadataParser) { this.clientHelper = clientHelper; this.metadataParser = metadataParser; } diff --git a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java index 97740b10acb6ab0c6b9705669c5215dd6cee4ed1..e5f918171b42ffee1af8a5e6121c281e4060727e 100644 --- a/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java +++ b/briar-core/src/org/briarproject/introduction/IntroductionManagerImpl.java @@ -3,6 +3,7 @@ package org.briarproject.introduction; import org.briarproject.api.FormatException; import org.briarproject.api.clients.Client; import org.briarproject.api.clients.ClientHelper; +import org.briarproject.api.clients.SessionId; import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.ContactId; import org.briarproject.api.contact.ContactManager.AddContactHook; @@ -20,14 +21,12 @@ import org.briarproject.api.introduction.IntroductionManager; import org.briarproject.api.introduction.IntroductionMessage; import org.briarproject.api.introduction.IntroductionRequest; import org.briarproject.api.introduction.IntroductionResponse; -import org.briarproject.api.clients.SessionId; import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageStatus; -import org.briarproject.api.system.Clock; import org.briarproject.clients.BdfIncomingMessageHook; import org.briarproject.util.StringUtils; @@ -93,12 +92,11 @@ class IntroductionManagerImpl extends BdfIncomingMessageHook @Inject IntroductionManagerImpl(DatabaseComponent db, ClientHelper clientHelper, - MetadataParser metadataParser, Clock clock, - IntroducerManager introducerManager, + MetadataParser metadataParser, IntroducerManager introducerManager, IntroduceeManager introduceeManager, IntroductionGroupFactory introductionGroupFactory) { - super(clientHelper, metadataParser, clock); + super(clientHelper, metadataParser); this.db = db; this.introducerManager = introducerManager; this.introduceeManager = introduceeManager; diff --git a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java index fac0b0b32dbf483210e28468518613084069c53d..2b3bde49fb13e68d99e6a4ba6a0b8429cc5adf2c 100644 --- a/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java +++ b/briar-tests/src/org/briarproject/introduction/IntroductionManagerImplTest.java @@ -118,7 +118,7 @@ public class IntroductionManagerImplTest extends BriarTestCase { clock = context.mock(Clock.class); introductionManager = new IntroductionManagerImpl( - db, clientHelper, metadataParser, clock, introducerManager, + db, clientHelper, metadataParser, introducerManager, introduceeManager, introductionGroupFactory ); }