From 79482d5e3ad1042959b3986afb0cea23368cb70e Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 12 May 2020 17:36:35 +0100 Subject: [PATCH] Move connection management to its own package. --- .../ConnectionManager.java | 5 ++- .../ConnectionRegistry.java | 3 +- .../bramble/BrambleCoreModule.java | 2 ++ .../{plugin => connection}/Connection.java | 4 +-- .../ConnectionFactory.java | 4 +-- .../ConnectionFactoryImpl.java | 6 ++-- .../ConnectionManagerImpl.java | 4 +-- .../bramble/connection/ConnectionModule.java | 33 +++++++++++++++++++ .../ConnectionRegistryImpl.java | 4 +-- .../DuplexSyncConnection.java | 4 +-- .../HandshakeConnection.java | 8 +++-- .../IncomingDuplexSyncConnection.java | 6 ++-- .../IncomingHandshakeConnection.java | 8 +++-- .../IncomingSimplexSyncConnection.java | 4 +-- .../OutgoingDuplexSyncConnection.java | 6 ++-- .../OutgoingHandshakeConnection.java | 6 ++-- .../OutgoingSimplexSyncConnection.java | 4 +-- .../SyncConnection.java | 4 +-- .../bramble/plugin/PluginManagerImpl.java | 2 +- .../bramble/plugin/PluginModule.java | 22 ------------- .../bramble/plugin/PollerImpl.java | 4 +-- .../rendezvous/RendezvousPollerImpl.java | 2 +- .../ConnectionRegistryImplTest.java | 4 +-- ...ntactExchangeIntegrationTestComponent.java | 2 +- .../bramble/plugin/PluginManagerImplTest.java | 2 +- .../bramble/plugin/PollerImplTest.java | 4 +-- .../rendezvous/RendezvousPollerImplTest.java | 2 +- .../briar/android/AndroidComponent.java | 2 +- .../android/contact/ContactListFragment.java | 2 +- .../controller/SharingControllerImpl.java | 2 +- .../conversation/ConversationActivity.java | 2 +- .../introduction/ContactChooserFragment.java | 2 +- .../ContactExchangeViewModel.java | 2 +- .../GroupMemberListControllerImpl.java | 2 +- .../sharing/SharingStatusActivity.java | 2 +- ...plexMessagingIntegrationTestComponent.java | 2 +- .../test/BriarIntegrationTestComponent.java | 2 +- 37 files changed, 102 insertions(+), 77 deletions(-) rename bramble-api/src/main/java/org/briarproject/bramble/api/{plugin => connection}/ConnectionManager.java (85%) rename bramble-api/src/main/java/org/briarproject/bramble/api/{plugin => connection}/ConnectionRegistry.java (95%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/Connection.java (95%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/ConnectionFactory.java (91%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/ConnectionFactoryImpl.java (96%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/ConnectionManagerImpl.java (95%) create mode 100644 bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionModule.java rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/ConnectionRegistryImpl.java (97%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/DuplexSyncConnection.java (96%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/HandshakeConnection.java (90%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/IncomingDuplexSyncConnection.java (94%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/IncomingHandshakeConnection.java (92%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/IncomingSimplexSyncConnection.java (95%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/OutgoingDuplexSyncConnection.java (95%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/OutgoingHandshakeConnection.java (95%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/OutgoingSimplexSyncConnection.java (96%) rename bramble-core/src/main/java/org/briarproject/bramble/{plugin => connection}/SyncConnection.java (95%) rename bramble-core/src/test/java/org/briarproject/bramble/{plugin => connection}/ConnectionRegistryImplTest.java (98%) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java similarity index 85% rename from bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionManager.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java index c7c8113f9..e08a73e9b 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java @@ -1,8 +1,11 @@ -package org.briarproject.bramble.api.plugin; +package org.briarproject.bramble.api.connection; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.TransportConnectionReader; +import org.briarproject.bramble.api.plugin.TransportConnectionWriter; +import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; @NotNullByDefault diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionRegistry.java b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java similarity index 95% rename from bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionRegistry.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java index 7f0adec36..715a4da9e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/ConnectionRegistry.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java @@ -1,8 +1,9 @@ -package org.briarproject.bramble.api.plugin; +package org.briarproject.bramble.api.connection; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java index d95b07e0a..e2b7deae8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java @@ -1,6 +1,7 @@ package org.briarproject.bramble; import org.briarproject.bramble.client.ClientModule; +import org.briarproject.bramble.connection.ConnectionModule; import org.briarproject.bramble.contact.ContactModule; import org.briarproject.bramble.crypto.CryptoExecutorModule; import org.briarproject.bramble.crypto.CryptoModule; @@ -28,6 +29,7 @@ import dagger.Module; @Module(includes = { ClientModule.class, + ConnectionModule.class, ContactModule.class, CryptoModule.class, CryptoExecutorModule.class, diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/Connection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/Connection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java index 39a7d6226..1efe2d480 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/Connection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/Connection.java @@ -1,8 +1,8 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactory.java similarity index 91% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactory.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactory.java index e7bd16d1b..31fb33457 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactory.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactory.java @@ -1,9 +1,9 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactoryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactoryImpl.java similarity index 96% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactoryImpl.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactoryImpl.java index af3d6d21a..197a0d813 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionFactoryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionFactoryImpl.java @@ -1,13 +1,13 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionManagerImpl.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java index 201da7980..463eca197 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionManagerImpl.java @@ -1,10 +1,10 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionModule.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionModule.java new file mode 100644 index 000000000..70d7f9471 --- /dev/null +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionModule.java @@ -0,0 +1,33 @@ +package org.briarproject.bramble.connection; + +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; + +import javax.inject.Singleton; + +import dagger.Module; +import dagger.Provides; + +@Module +public class ConnectionModule { + + @Provides + @Singleton + ConnectionManager provideConnectionManager( + ConnectionManagerImpl connectionManager) { + return connectionManager; + } + + @Provides + ConnectionFactory provideConnectionFactory( + ConnectionFactoryImpl connectionFactory) { + return connectionFactory; + } + + @Provides + @Singleton + ConnectionRegistry provideConnectionRegistry( + ConnectionRegistryImpl connectionRegistry) { + return connectionRegistry; + } +} diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionRegistryImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java similarity index 97% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionRegistryImpl.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java index 06056f960..1bba22593 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/ConnectionRegistryImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/ConnectionRegistryImpl.java @@ -1,11 +1,11 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; import org.briarproject.bramble.api.Multiset; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/DuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java similarity index 96% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/DuplexSyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java index bf4526086..0ed62ab0b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/DuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/DuplexSyncConnection.java @@ -1,8 +1,8 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/HandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java similarity index 90% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/HandshakeConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java index 15ddf644d..7405bbe2e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/HandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/HandshakeConnection.java @@ -1,11 +1,12 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; @@ -20,6 +21,7 @@ import javax.annotation.Nullable; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +@NotNullByDefault abstract class HandshakeConnection extends Connection { final HandshakeManager handshakeManager; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingDuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java similarity index 94% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingDuplexSyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java index 62739b97c..382b17a50 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingDuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingDuplexSyncConnection.java @@ -1,8 +1,9 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -19,6 +20,7 @@ import java.util.concurrent.Executor; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +@NotNullByDefault class IncomingDuplexSyncConnection extends DuplexSyncConnection implements Runnable { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingHandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java similarity index 92% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingHandshakeConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java index 0a500c69d..d919c1bd4 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingHandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingHandshakeConnection.java @@ -1,12 +1,13 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.HandshakeManager; import org.briarproject.bramble.api.contact.HandshakeManager.HandshakeResult; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.transport.KeyManager; @@ -21,6 +22,7 @@ import java.io.InputStream; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +@NotNullByDefault class IncomingHandshakeConnection extends HandshakeConnection implements Runnable { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingSimplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingSimplexSyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java index c782595e7..9bf5980f8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/IncomingSimplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/IncomingSimplexSyncConnection.java @@ -1,8 +1,8 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingDuplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingDuplexSyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java index e0b3218b0..0c8f464fb 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingDuplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingDuplexSyncConnection.java @@ -1,8 +1,9 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.properties.TransportPropertyManager; @@ -19,6 +20,7 @@ import java.util.concurrent.Executor; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +@NotNullByDefault class OutgoingDuplexSyncConnection extends DuplexSyncConnection implements Runnable { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingHandshakeConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingHandshakeConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java index 3a78c0a92..7a2e5264e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingHandshakeConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingHandshakeConnection.java @@ -1,5 +1,7 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.HandshakeManager; @@ -7,8 +9,6 @@ import org.briarproject.bramble.api.contact.HandshakeManager.HandshakeResult; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; import org.briarproject.bramble.api.transport.KeyManager; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingSimplexSyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java similarity index 96% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingSimplexSyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java index 300c25f23..7136c818f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/OutgoingSimplexSyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/OutgoingSimplexSyncConnection.java @@ -1,8 +1,8 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/SyncConnection.java b/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java similarity index 95% rename from bramble-core/src/main/java/org/briarproject/bramble/plugin/SyncConnection.java rename to bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java index d603fd5d4..40ac2cac2 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/SyncConnection.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/connection/SyncConnection.java @@ -1,9 +1,9 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportConnectionReader; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportPropertyManager; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java index d4d69ca56..c7b33692a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginManagerImpl.java @@ -1,12 +1,12 @@ package org.briarproject.bramble.plugin; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginConfig; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginModule.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginModule.java index f60bad880..ff5e2299a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PluginModule.java @@ -3,8 +3,6 @@ package org.briarproject.bramble.plugin; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.plugin.BackoffFactory; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.PluginManager; @@ -29,26 +27,6 @@ public class PluginModule { return new BackoffFactoryImpl(); } - @Provides - @Singleton - ConnectionManager provideConnectionManager( - ConnectionManagerImpl connectionManager) { - return connectionManager; - } - - @Provides - ConnectionFactory provideConnectionFactory( - ConnectionFactoryImpl connectionFactory) { - return connectionFactory; - } - - @Provides - @Singleton - ConnectionRegistry provideConnectionRegistry( - ConnectionRegistryImpl connectionRegistry) { - return connectionRegistry; - } - @Provides @Singleton PluginManager providePluginManager(LifecycleManager lifecycleManager, diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java index 256bf215e..c42e49a8c 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java @@ -1,6 +1,8 @@ package org.briarproject.bramble.plugin; import org.briarproject.bramble.api.Pair; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.event.ContactAddedEvent; import org.briarproject.bramble.api.db.DbException; @@ -9,8 +11,6 @@ import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java index d16317bff..8e41e9b64 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java @@ -2,6 +2,7 @@ package org.briarproject.bramble.rendezvous; import org.briarproject.bramble.PoliteExecutor; import org.briarproject.bramble.api.Pair; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.contact.PendingContactState; @@ -23,7 +24,6 @@ import org.briarproject.bramble.api.lifecycle.Service; import org.briarproject.bramble.api.lifecycle.ServiceException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.ConnectionHandler; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionReader; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/connection/ConnectionRegistryImplTest.java similarity index 98% rename from bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java rename to bramble-core/src/test/java/org/briarproject/bramble/connection/ConnectionRegistryImplTest.java index 13c0466e8..3edf4ddc8 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/ConnectionRegistryImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/connection/ConnectionRegistryImplTest.java @@ -1,9 +1,9 @@ -package org.briarproject.bramble.plugin; +package org.briarproject.bramble.connection; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.PendingContactId; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent; import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTestComponent.java index dd47cfbbd..7f91988a0 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/contact/ContactExchangeIntegrationTestComponent.java @@ -2,13 +2,13 @@ package org.briarproject.bramble.contact; import org.briarproject.bramble.BrambleCoreEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import java.util.concurrent.Executor; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java index 93f649db8..02e896f27 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PluginManagerImplTest.java @@ -1,7 +1,7 @@ package org.briarproject.bramble.plugin; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.event.EventBus; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.PluginCallback; import org.briarproject.bramble.api.plugin.PluginConfig; import org.briarproject.bramble.api.plugin.PluginException; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java index 255635a13..522c9aad9 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/PollerImplTest.java @@ -1,10 +1,10 @@ package org.briarproject.bramble.plugin; +import org.briarproject.bramble.api.connection.ConnectionManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.event.ContactAddedEvent; import org.briarproject.bramble.api.plugin.ConnectionHandler; -import org.briarproject.bramble.api.plugin.ConnectionManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.Plugin; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportConnectionWriter; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java index 0f65d9adf..eddaacce4 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.rendezvous; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.PendingContact; import org.briarproject.bramble.api.contact.PendingContactState; import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent; @@ -13,7 +14,6 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.plugin.ConnectionHandler; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index ce30c42e5..5a9092582 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -7,6 +7,7 @@ import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.account.BriarAccountModule; import org.briarproject.bramble.api.FeatureFlags; import org.briarproject.bramble.api.account.AccountManager; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.crypto.CryptoExecutor; @@ -19,7 +20,6 @@ import org.briarproject.bramble.api.keyagreement.PayloadEncoder; import org.briarproject.bramble.api.keyagreement.PayloadParser; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.settings.SettingsManager; import org.briarproject.bramble.api.system.AndroidExecutor; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java index a2adf44de..f76a05cac 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java @@ -10,6 +10,7 @@ import android.widget.TextView; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -24,7 +25,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.briar.R; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java index 2d22db901..858c94c53 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java @@ -1,11 +1,11 @@ package org.briarproject.briar.android.controller; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 6aa6986c7..1e4a8c416 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -21,6 +21,7 @@ import com.google.android.material.snackbar.Snackbar; import org.briarproject.bramble.api.FeatureFlags; import org.briarproject.bramble.api.Pair; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.contact.event.ContactRemovedEvent; @@ -33,7 +34,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent; import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent; import org.briarproject.bramble.api.sync.ClientId; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java index 19c982029..176fde641 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java @@ -5,13 +5,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java index d37a19b84..054121cac 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeViewModel.java @@ -2,6 +2,7 @@ package org.briarproject.briar.android.keyagreement; import android.app.Application; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.crypto.SecretKey; @@ -10,7 +11,6 @@ import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListControllerImpl.java index 92f6343ef..13b7ba346 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/GroupMemberListControllerImpl.java @@ -1,10 +1,10 @@ package org.briarproject.briar.android.privategroup.memberlist; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.briar.android.controller.DbControllerImpl; import org.briarproject.briar.android.controller.handler.ResultExceptionHandler; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java index a6dcd9516..ab8e0e1ae 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingStatusActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.view.MenuItem; import android.widget.TextView; +import org.briarproject.bramble.api.connection.ConnectionRegistry; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; @@ -13,7 +14,6 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import org.briarproject.bramble.api.plugin.ConnectionRegistry; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.event.GroupRemovedEvent; import org.briarproject.briar.R; diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java index 9551ba793..1096b4314 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/SimplexMessagingIntegrationTestComponent.java @@ -2,11 +2,11 @@ package org.briarproject.briar.messaging; import org.briarproject.bramble.BrambleCoreEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageFactory; diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java index b998882ff..337303db4 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTestComponent.java @@ -3,13 +3,13 @@ package org.briarproject.briar.test; import org.briarproject.bramble.BrambleCoreEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.api.client.ClientHelper; +import org.briarproject.bramble.api.connection.ConnectionManager; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.AuthorFactory; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; -import org.briarproject.bramble.api.plugin.ConnectionManager; import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.briar.api.blog.BlogFactory;