diff --git a/briar-core/src/org/briarproject/invitation/AliceConnector.java b/briar-core/src/org/briarproject/invitation/AliceConnector.java index 47c7b0a16d9868c7047b9e9a7e5e9176cf839993..39945bf6b61a0585e003df8dc3073a238f6d10c1 100644 --- a/briar-core/src/org/briarproject/invitation/AliceConnector.java +++ b/briar-core/src/org/briarproject/invitation/AliceConnector.java @@ -15,9 +15,7 @@ import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; -import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.system.Clock; -import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; @@ -41,12 +39,11 @@ class AliceConnector extends Connector { BdfWriterFactory bdfWriterFactory, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, - AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionManager connectionManager, + AuthorFactory authorFactory, ConnectionManager connectionManager, ContactManager contactManager, Clock clock, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) { super(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory, - streamWriterFactory, authorFactory, groupFactory, keyManager, + streamWriterFactory, authorFactory, connectionManager, contactManager, clock, group, plugin, localAuthor, random); } diff --git a/briar-core/src/org/briarproject/invitation/BobConnector.java b/briar-core/src/org/briarproject/invitation/BobConnector.java index 945c56d1c6a07fe1fca6f5b35244f5e8f4c187ec..53bdbe3e47b7d32afb2e36667ba65175f45fc91b 100644 --- a/briar-core/src/org/briarproject/invitation/BobConnector.java +++ b/briar-core/src/org/briarproject/invitation/BobConnector.java @@ -15,9 +15,7 @@ import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; -import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.system.Clock; -import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; @@ -41,12 +39,11 @@ class BobConnector extends Connector { BdfWriterFactory bdfWriterFactory, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, - AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionManager connectionManager, + AuthorFactory authorFactory, ConnectionManager connectionManager, ContactManager contactManager, Clock clock, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) { super(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory, - streamWriterFactory, authorFactory, groupFactory, keyManager, + streamWriterFactory, authorFactory, connectionManager, contactManager, clock, group, plugin, localAuthor, random); } diff --git a/briar-core/src/org/briarproject/invitation/Connector.java b/briar-core/src/org/briarproject/invitation/Connector.java index 702671364f551ab81d5708e7c873ab41c9e42983..8b26b16295b672eb22f5b4788a3c7dfaa057e671 100644 --- a/briar-core/src/org/briarproject/invitation/Connector.java +++ b/briar-core/src/org/briarproject/invitation/Connector.java @@ -22,9 +22,7 @@ import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; import org.briarproject.api.plugins.duplex.DuplexTransportConnection; -import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.system.Clock; -import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; @@ -52,8 +50,6 @@ abstract class Connector extends Thread { protected final StreamReaderFactory streamReaderFactory; protected final StreamWriterFactory streamWriterFactory; protected final AuthorFactory authorFactory; - protected final GroupFactory groupFactory; - protected final KeyManager keyManager; protected final ConnectionManager connectionManager; protected final ContactManager contactManager; protected final Clock clock; @@ -74,8 +70,7 @@ abstract class Connector extends Thread { BdfWriterFactory bdfWriterFactory, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, - AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionManager connectionManager, + AuthorFactory authorFactory, ConnectionManager connectionManager, ContactManager contactManager, Clock clock, ConnectorGroup group, DuplexPlugin plugin, LocalAuthor localAuthor, PseudoRandom random) { super("Connector"); @@ -85,8 +80,6 @@ abstract class Connector extends Thread { this.streamReaderFactory = streamReaderFactory; this.streamWriterFactory = streamWriterFactory; this.authorFactory = authorFactory; - this.groupFactory = groupFactory; - this.keyManager = keyManager; this.connectionManager = connectionManager; this.contactManager = contactManager; this.clock = clock; diff --git a/briar-core/src/org/briarproject/invitation/ConnectorGroup.java b/briar-core/src/org/briarproject/invitation/ConnectorGroup.java index 9025c9dff47388a652eeebb7e18c315b6435c7d1..30447a06bc71a0b0d674604d231e3bc7b60a7c4d 100644 --- a/briar-core/src/org/briarproject/invitation/ConnectorGroup.java +++ b/briar-core/src/org/briarproject/invitation/ConnectorGroup.java @@ -17,9 +17,7 @@ import org.briarproject.api.invitation.InvitationTask; import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.PluginManager; import org.briarproject.api.plugins.duplex.DuplexPlugin; -import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.system.Clock; -import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; @@ -48,8 +46,6 @@ class ConnectorGroup extends Thread implements InvitationTask { private final StreamReaderFactory streamReaderFactory; private final StreamWriterFactory streamWriterFactory; private final AuthorFactory authorFactory; - private final GroupFactory groupFactory; - private final KeyManager keyManager; private final ConnectionManager connectionManager; private final IdentityManager identityManager; private final ContactManager contactManager; @@ -74,8 +70,7 @@ class ConnectorGroup extends Thread implements InvitationTask { BdfWriterFactory bdfWriterFactory, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, - AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionManager connectionManager, + AuthorFactory authorFactory, ConnectionManager connectionManager, IdentityManager identityManager, ContactManager contactManager, Clock clock, PluginManager pluginManager, AuthorId localAuthorId, int localInvitationCode, int remoteInvitationCode) { @@ -86,8 +81,6 @@ class ConnectorGroup extends Thread implements InvitationTask { this.streamReaderFactory = streamReaderFactory; this.streamWriterFactory = streamWriterFactory; this.authorFactory = authorFactory; - this.groupFactory = groupFactory; - this.keyManager = keyManager; this.connectionManager = connectionManager; this.identityManager = identityManager; this.contactManager = contactManager; @@ -181,8 +174,8 @@ class ConnectorGroup extends Thread implements InvitationTask { remoteInvitationCode); return new AliceConnector(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory, streamWriterFactory, authorFactory, - groupFactory, keyManager, connectionManager, contactManager, - clock, this, plugin, localAuthor, random); + connectionManager, contactManager, clock, this, plugin, + localAuthor, random); } private Connector createBobConnector(DuplexPlugin plugin, @@ -191,8 +184,8 @@ class ConnectorGroup extends Thread implements InvitationTask { localInvitationCode); return new BobConnector(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory, streamWriterFactory, authorFactory, - groupFactory, keyManager, connectionManager, contactManager, - clock, this, plugin, localAuthor, random); + connectionManager, contactManager, clock, this, plugin, + localAuthor, random); } public void localConfirmationSucceeded() { diff --git a/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java b/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java index 0b6b4cdf827ae44eed3be07640a2c204e1fa47eb..49874be45da6a720bfd912a13085a868c5aad73a 100644 --- a/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java +++ b/briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java @@ -11,9 +11,7 @@ import org.briarproject.api.invitation.InvitationTask; import org.briarproject.api.invitation.InvitationTaskFactory; import org.briarproject.api.plugins.ConnectionManager; import org.briarproject.api.plugins.PluginManager; -import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.system.Clock; -import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; @@ -27,8 +25,6 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { private final StreamReaderFactory streamReaderFactory; private final StreamWriterFactory streamWriterFactory; private final AuthorFactory authorFactory; - private final GroupFactory groupFactory; - private final KeyManager keyManager; private final ConnectionManager connectionManager; private final IdentityManager identityManager; private final ContactManager contactManager; @@ -40,8 +36,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { BdfReaderFactory bdfReaderFactory, BdfWriterFactory bdfWriterFactory, StreamReaderFactory streamReaderFactory, StreamWriterFactory streamWriterFactory, - AuthorFactory authorFactory, GroupFactory groupFactory, - KeyManager keyManager, ConnectionManager connectionManager, + AuthorFactory authorFactory, ConnectionManager connectionManager, IdentityManager identityManager, ContactManager contactManager, Clock clock, PluginManager pluginManager) { this.crypto = crypto; @@ -50,8 +45,6 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { this.streamReaderFactory = streamReaderFactory; this.streamWriterFactory = streamWriterFactory; this.authorFactory = authorFactory; - this.groupFactory = groupFactory; - this.keyManager = keyManager; this.connectionManager = connectionManager; this.identityManager = identityManager; this.contactManager = contactManager; @@ -63,8 +56,7 @@ class InvitationTaskFactoryImpl implements InvitationTaskFactory { int remoteCode) { return new ConnectorGroup(crypto, bdfReaderFactory, bdfWriterFactory, streamReaderFactory, streamWriterFactory, authorFactory, - groupFactory, keyManager, connectionManager, identityManager, - contactManager, clock, pluginManager, localAuthorId, localCode, - remoteCode); + connectionManager, identityManager, contactManager, clock, + pluginManager, localAuthorId, localCode, remoteCode); } }