From 339e4dadedde5cd5dc13d233c419cf6ee082caeb Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 3 Aug 2022 15:22:11 +0100 Subject: [PATCH] Update Dagger modules. --- .../bramble/BrambleAndroidModule.java | 2 + .../briarproject/bramble/io}/DnsModule.java | 2 +- .../org/briarproject/bramble/io}/NoDns.java | 5 +- .../bramble/mailbox/MailboxModule.java | 52 +++++++++++++++++++ ...ntactExchangeIntegrationTestComponent.java | 6 ++- ...emovableDriveIntegrationTestComponent.java | 6 ++- .../sync/SyncIntegrationTestComponent.java | 6 ++- .../test/BrambleIntegrationTestComponent.java | 4 +- .../bramble}/test/TestDnsModule.java | 2 +- .../TransportKeyAgreementTestComponent.java | 6 ++- .../bramble/BrambleJavaModule.java | 2 + .../bramble/plugin/tor/BridgeTest.java | 17 +++--- .../BrambleJavaIntegrationTestComponent.java | 3 +- .../bramble/test/TestTorPortsModule.java | 26 ++++++++++ .../briarproject/briar/BriarCoreModule.java | 2 - .../FeedManagerIntegrationTestComponent.java | 4 +- .../IntroductionIntegrationTestComponent.java | 6 ++- .../MessageSizeIntegrationTestComponent.java | 6 ++- ...plexMessagingIntegrationTestComponent.java | 6 ++- .../test/BriarIntegrationTestComponent.java | 6 ++- .../briar/headless/BriarHeadlessApp.kt | 2 + .../briar/headless/HeadlessModule.kt | 10 +--- .../briar/headless/BriarHeadlessTestApp.kt | 2 + .../briar/headless/HeadlessTestModule.kt | 8 --- 24 files changed, 150 insertions(+), 41 deletions(-) rename {briar-core/src/main/java/org/briarproject/briar/feed => bramble-core/src/main/java/org/briarproject/bramble/io}/DnsModule.java (86%) rename {briar-core/src/main/java/org/briarproject/briar/feed => bramble-core/src/main/java/org/briarproject/bramble/io}/NoDns.java (81%) rename {briar-core/src/test/java/org/briarproject/briar => bramble-core/src/test/java/org/briarproject/bramble}/test/TestDnsModule.java (80%) create mode 100644 bramble-java/src/test/java/org/briarproject/bramble/test/TestTorPortsModule.java diff --git a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java index 917926ed2..5be846f61 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java @@ -1,6 +1,7 @@ package org.briarproject.bramble; import org.briarproject.bramble.battery.AndroidBatteryModule; +import org.briarproject.bramble.io.DnsModule; import org.briarproject.bramble.network.AndroidNetworkModule; import org.briarproject.bramble.plugin.tor.CircumventionModule; import org.briarproject.bramble.reporting.ReportingModule; @@ -18,6 +19,7 @@ import dagger.Module; AndroidTaskSchedulerModule.class, AndroidWakefulIoExecutorModule.class, CircumventionModule.class, + DnsModule.class, ReportingModule.class, SocksModule.class }) diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/DnsModule.java b/bramble-core/src/main/java/org/briarproject/bramble/io/DnsModule.java similarity index 86% rename from briar-core/src/main/java/org/briarproject/briar/feed/DnsModule.java rename to bramble-core/src/main/java/org/briarproject/bramble/io/DnsModule.java index dc6cd8a88..b489d11f9 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/DnsModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/io/DnsModule.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.feed; +package org.briarproject.bramble.io; import dagger.Module; import dagger.Provides; diff --git a/briar-core/src/main/java/org/briarproject/briar/feed/NoDns.java b/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java similarity index 81% rename from briar-core/src/main/java/org/briarproject/briar/feed/NoDns.java rename to bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java index 5f5cc8c44..91a8616ed 100644 --- a/briar-core/src/main/java/org/briarproject/briar/feed/NoDns.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/io/NoDns.java @@ -1,4 +1,6 @@ -package org.briarproject.briar.feed; +package org.briarproject.bramble.io; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.net.InetAddress; import java.net.UnknownHostException; @@ -9,6 +11,7 @@ import javax.inject.Inject; import okhttp3.Dns; +@NotNullByDefault class NoDns implements Dns { private static final byte[] UNSPECIFIED_ADDRESS = new byte[4]; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java index 73e418ed4..3d7845799 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java @@ -4,17 +4,22 @@ import org.briarproject.bramble.api.FeatureFlags; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.data.MetadataEncoder; +import org.briarproject.bramble.api.db.DatabaseExecutor; +import org.briarproject.bramble.api.db.TransactionManager; import org.briarproject.bramble.api.event.EventBus; +import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.mailbox.MailboxManager; import org.briarproject.bramble.api.mailbox.MailboxSettingsManager; import org.briarproject.bramble.api.mailbox.MailboxUpdateManager; import org.briarproject.bramble.api.mailbox.MailboxVersion; +import org.briarproject.bramble.api.plugin.PluginManager; import org.briarproject.bramble.api.sync.validation.ValidationManager; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.versioning.ClientVersioningManager; import java.util.List; +import java.util.concurrent.Executor; import javax.inject.Inject; import javax.inject.Singleton; @@ -37,6 +42,8 @@ public class MailboxModule { MailboxUpdateManager mailboxUpdateManager; @Inject MailboxFileManager mailboxFileManager; + @Inject + MailboxClientManager mailboxClientManager; } @Provides @@ -126,4 +133,49 @@ public class MailboxModule { MailboxWorkerFactoryImpl mailboxWorkerFactory) { return mailboxWorkerFactory; } + + @Provides + MailboxClientFactory provideMailboxClientFactory( + MailboxClientFactoryImpl mailboxClientFactory) { + return mailboxClientFactory; + } + + @Provides + MailboxApiCaller provideMailboxApiCaller( + MailboxApiCallerImpl mailboxApiCaller) { + return mailboxApiCaller; + } + + @Provides + @Singleton + TorReachabilityMonitor provideTorReachabilityMonitor( + TorReachabilityMonitorImpl reachabilityMonitor) { + return reachabilityMonitor; + } + + @Provides + @Singleton + MailboxClientManager provideMailboxClientManager( + @EventExecutor Executor eventExecutor, + @DatabaseExecutor Executor dbExecutor, + TransactionManager db, + ContactManager contactManager, + PluginManager pluginManager, + MailboxSettingsManager mailboxSettingsManager, + MailboxUpdateManager mailboxUpdateManager, + MailboxClientFactory mailboxClientFactory, + TorReachabilityMonitor reachabilityMonitor, + FeatureFlags featureFlags, + LifecycleManager lifecycleManager, + EventBus eventBus) { + MailboxClientManager manager = new MailboxClientManager(eventExecutor, + dbExecutor, db, contactManager, pluginManager, + mailboxSettingsManager, mailboxUpdateManager, + mailboxClientFactory, reachabilityMonitor); + if (featureFlags.shouldEnableMailbox()) { + lifecycleManager.registerService(manager); + eventBus.addListener(manager); + } + return manager; + } } 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 99afc4005..97f1eeaf7 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 @@ -10,6 +10,8 @@ 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.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import java.util.concurrent.Executor; @@ -20,7 +22,9 @@ import dagger.Component; @Singleton @Component(modules = { BrambleCoreIntegrationTestModule.class, - BrambleCoreModule.class + BrambleCoreModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface ContactExchangeIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestComponent.java index 32c0471aa..6c5080dc6 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/file/RemovableDriveIntegrationTestComponent.java @@ -12,9 +12,11 @@ import org.briarproject.bramble.event.DefaultEventExecutorModule; import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule; import org.briarproject.bramble.system.TimeTravelModule; import org.briarproject.bramble.test.TestDatabaseConfigModule; +import org.briarproject.bramble.test.TestDnsModule; import org.briarproject.bramble.test.TestFeatureFlagModule; import org.briarproject.bramble.test.TestMailboxDirectoryModule; import org.briarproject.bramble.test.TestSecureRandomModule; +import org.briarproject.bramble.test.TestSocksModule; import javax.inject.Singleton; @@ -27,12 +29,14 @@ import dagger.Component; DefaultEventExecutorModule.class, DefaultWakefulIoExecutorModule.class, TestDatabaseConfigModule.class, + TestDnsModule.class, TestFeatureFlagModule.class, TestMailboxDirectoryModule.class, RemovableDriveIntegrationTestModule.class, RemovableDriveModule.class, TestSecureRandomModule.class, - TimeTravelModule.class + TimeTravelModule.class, + TestSocksModule.class }) interface RemovableDriveIntegrationTestComponent extends BrambleCoreEagerSingletons { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java index 701d706ad..4a0a8a83a 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTestComponent.java @@ -3,6 +3,8 @@ package org.briarproject.bramble.sync; import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import javax.inject.Singleton; @@ -11,7 +13,9 @@ import dagger.Component; @Singleton @Component(modules = { BrambleCoreIntegrationTestModule.class, - BrambleCoreModule.class + BrambleCoreModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface SyncIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTestComponent.java index c7b0d80c5..444da32a3 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleIntegrationTestComponent.java @@ -14,7 +14,9 @@ import dagger.Component; @Singleton @Component(modules = { BrambleCoreIntegrationTestModule.class, - BrambleCoreModule.class + BrambleCoreModule.class, + TestDnsModule.class, + TestSocksModule.class }) public interface BrambleIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { diff --git a/briar-core/src/test/java/org/briarproject/briar/test/TestDnsModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDnsModule.java similarity index 80% rename from briar-core/src/test/java/org/briarproject/briar/test/TestDnsModule.java rename to bramble-core/src/test/java/org/briarproject/bramble/test/TestDnsModule.java index 13323b346..f18aac8d5 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/TestDnsModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestDnsModule.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.test; +package org.briarproject.bramble.test; import dagger.Module; import dagger.Provides; diff --git a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementTestComponent.java b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementTestComponent.java index a0de3c5e4..a54852b17 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementTestComponent.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/transport/agreement/TransportKeyAgreementTestComponent.java @@ -9,6 +9,8 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.transport.KeyManager; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.bramble.test.BrambleIntegrationTestComponent; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import javax.inject.Singleton; @@ -17,7 +19,9 @@ import dagger.Component; @Singleton @Component(modules = { BrambleCoreIntegrationTestModule.class, - BrambleCoreModule.class + BrambleCoreModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface TransportKeyAgreementTestComponent extends BrambleIntegrationTestComponent { diff --git a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java index f50ea15ae..cdb764909 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java @@ -1,5 +1,6 @@ package org.briarproject.bramble; +import org.briarproject.bramble.io.DnsModule; import org.briarproject.bramble.network.JavaNetworkModule; import org.briarproject.bramble.plugin.tor.CircumventionModule; import org.briarproject.bramble.socks.SocksModule; @@ -9,6 +10,7 @@ import dagger.Module; @Module(includes = { CircumventionModule.class, + DnsModule.class, JavaNetworkModule.class, JavaSystemModule.class, SocksModule.class diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index 4e4b0524f..79818a349 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -9,6 +9,8 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor; import org.briarproject.bramble.api.network.NetworkManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.BackoffFactory; +import org.briarproject.bramble.api.plugin.TorControlPort; +import org.briarproject.bramble.api.plugin.TorSocksPort; import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.LocationUtils; @@ -42,8 +44,6 @@ import static java.util.Collections.singletonList; import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE; -import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT; -import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.DEFAULT_OBFS4; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.MEEK; import static org.briarproject.bramble.plugin.tor.CircumventionProvider.BridgeType.NON_DEFAULT_OBFS4; @@ -89,9 +89,6 @@ public class BridgeTest extends BrambleTestCase { private final static long MEEK_TIMEOUT = MINUTES.toMillis(6); private final static int UNREACHABLE_BRIDGES_ALLOWED = 6; private final static int ATTEMPTS_PER_BRIDGE = 5; - // Use different ports from Briar Desktop to avoid conflicts - private final static int SOCKS_PORT = DEFAULT_SOCKS_PORT + 10; - private final static int CONTROL_PORT = DEFAULT_CONTROL_PORT + 10; private final static Logger LOG = getLogger(BridgeTest.class.getName()); @@ -115,6 +112,12 @@ public class BridgeTest extends BrambleTestCase { Clock clock; @Inject CryptoComponent crypto; + @Inject + @TorSocksPort + int torSocksPort; + @Inject + @TorControlPort + int torControlPort; private final File torDir = getTestDirectory(); private final Params params; @@ -167,8 +170,8 @@ public class BridgeTest extends BrambleTestCase { factory = new UnixTorPluginFactory(ioExecutor, wakefulIoExecutor, networkManager, locationUtils, eventBus, torSocketFactory, backoffFactory, resourceProvider, bridgeProvider, - batteryManager, clock, crypto, torDir, - SOCKS_PORT, CONTROL_PORT); + batteryManager, clock, crypto, torDir, torSocksPort, + torControlPort); } @After diff --git a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java index 489f83408..857f408e6 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java @@ -14,7 +14,8 @@ import dagger.Component; @Component(modules = { BrambleCoreIntegrationTestModule.class, BrambleCoreModule.class, - BrambleJavaModule.class + BrambleJavaModule.class, + TestTorPortsModule.class }) public interface BrambleJavaIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { diff --git a/bramble-java/src/test/java/org/briarproject/bramble/test/TestTorPortsModule.java b/bramble-java/src/test/java/org/briarproject/bramble/test/TestTorPortsModule.java new file mode 100644 index 000000000..a8f03045d --- /dev/null +++ b/bramble-java/src/test/java/org/briarproject/bramble/test/TestTorPortsModule.java @@ -0,0 +1,26 @@ +package org.briarproject.bramble.test; + +import org.briarproject.bramble.api.plugin.TorControlPort; +import org.briarproject.bramble.api.plugin.TorSocksPort; + +import dagger.Module; +import dagger.Provides; + +import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT; +import static org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT; + +@Module +class TestTorPortsModule { + + @Provides + @TorSocksPort + int provideTorSocksPort() { + return DEFAULT_SOCKS_PORT + 10; + } + + @Provides + @TorControlPort + int provideTorControlPort() { + return DEFAULT_CONTROL_PORT + 10; + } +} diff --git a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java index 9211d9201..fbd15acfd 100644 --- a/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java +++ b/briar-core/src/main/java/org/briarproject/briar/BriarCoreModule.java @@ -6,7 +6,6 @@ import org.briarproject.briar.avatar.AvatarModule; import org.briarproject.briar.blog.BlogModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.conversation.ConversationModule; -import org.briarproject.briar.feed.DnsModule; import org.briarproject.briar.feed.FeedModule; import org.briarproject.briar.forum.ForumModule; import org.briarproject.briar.identity.IdentityModule; @@ -26,7 +25,6 @@ import dagger.Module; BlogModule.class, BriarClientModule.class, ConversationModule.class, - DnsModule.class, FeedModule.class, ForumModule.class, GroupInvitationModule.class, diff --git a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java index 78b6c0f1c..8cdaa7bb3 100644 --- a/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/feed/FeedManagerIntegrationTestComponent.java @@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; import org.briarproject.bramble.test.TestSocksModule; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.feed.FeedManager; @@ -12,7 +13,6 @@ import org.briarproject.briar.avatar.AvatarModule; import org.briarproject.briar.blog.BlogModule; import org.briarproject.briar.client.BriarClientModule; import org.briarproject.briar.identity.IdentityModule; -import org.briarproject.briar.test.TestDnsModule; import javax.inject.Singleton; @@ -28,7 +28,7 @@ import dagger.Component; FeedModule.class, IdentityModule.class, TestDnsModule.class, - TestSocksModule.class, + TestSocksModule.class }) interface FeedManagerIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java index eb39cf1d6..ec856d553 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTestComponent.java @@ -2,6 +2,8 @@ package org.briarproject.briar.introduction; import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import org.briarproject.briar.attachment.AttachmentModule; import org.briarproject.briar.autodelete.AutoDeleteModule; import org.briarproject.briar.avatar.AvatarModule; @@ -36,7 +38,9 @@ import dagger.Component; IntroductionModule.class, MessagingModule.class, PrivateGroupModule.class, - SharingModule.class + SharingModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface IntroductionIntegrationTestComponent extends BriarIntegrationTestComponent { diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java index c7068b880..e84f80afe 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTestComponent.java @@ -3,6 +3,8 @@ package org.briarproject.briar.messaging; import org.briarproject.bramble.BrambleCoreIntegrationTestEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import org.briarproject.briar.autodelete.AutoDeleteModule; import org.briarproject.briar.avatar.AvatarModule; import org.briarproject.briar.client.BriarClientModule; @@ -24,7 +26,9 @@ import dagger.Component; ConversationModule.class, ForumModule.class, IdentityModule.class, - MessagingModule.class + MessagingModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface MessageSizeIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { 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 f0b97ee40..511946edf 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 @@ -8,6 +8,8 @@ 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.test.BrambleCoreIntegrationTestModule; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.PrivateMessageFactory; import org.briarproject.briar.autodelete.AutoDeleteModule; @@ -25,7 +27,9 @@ import dagger.Component; BrambleCoreModule.class, BriarClientModule.class, ConversationModule.class, - MessagingModule.class + MessagingModule.class, + TestDnsModule.class, + TestSocksModule.class }) interface SimplexMessagingIntegrationTestComponent extends BrambleCoreIntegrationTestEagerSingletons { 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 7c529d949..494961d9b 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 @@ -10,6 +10,8 @@ import org.briarproject.bramble.api.properties.TransportPropertyManager; import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.test.BrambleCoreIntegrationTestModule; import org.briarproject.bramble.test.BrambleIntegrationTestComponent; +import org.briarproject.bramble.test.TestDnsModule; +import org.briarproject.bramble.test.TestSocksModule; import org.briarproject.bramble.test.TimeTravel; import org.briarproject.briar.api.attachment.AttachmentReader; import org.briarproject.briar.api.autodelete.AutoDeleteManager; @@ -61,7 +63,9 @@ import dagger.Component; IntroductionModule.class, MessagingModule.class, PrivateGroupModule.class, - SharingModule.class + SharingModule.class, + TestDnsModule.class, + TestSocksModule.class }) public interface BriarIntegrationTestComponent extends BrambleIntegrationTestComponent { diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt index fc5a523ea..b3016d119 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/BriarHeadlessApp.kt @@ -3,6 +3,7 @@ package org.briarproject.briar.headless import dagger.Component import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.bramble.BrambleCoreModule +import org.briarproject.bramble.BrambleJavaModule import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.BriarCoreModule import java.security.SecureRandom @@ -11,6 +12,7 @@ import javax.inject.Singleton @Component( modules = [ BrambleCoreModule::class, + BrambleJavaModule::class, BriarCoreModule::class, HeadlessModule::class ] diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt index 018045a0a..a841f9913 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt @@ -18,16 +18,12 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory import org.briarproject.bramble.battery.DefaultBatteryManagerModule import org.briarproject.bramble.event.DefaultEventExecutorModule -import org.briarproject.bramble.network.JavaNetworkModule -import org.briarproject.bramble.plugin.tor.CircumventionModule import org.briarproject.bramble.plugin.tor.UnixTorPluginFactory import org.briarproject.bramble.plugin.tor.WindowsTorPluginFactory -import org.briarproject.bramble.socks.SocksModule import org.briarproject.bramble.system.ClockModule import org.briarproject.bramble.system.DefaultTaskSchedulerModule import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule import org.briarproject.bramble.system.DesktopSecureRandomModule -import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.bramble.util.OsUtils.isLinux import org.briarproject.bramble.util.OsUtils.isMac import org.briarproject.bramble.util.OsUtils.isWindows @@ -43,7 +39,6 @@ import javax.inject.Singleton @Module( includes = [ AccountModule::class, - CircumventionModule::class, ClockModule::class, DefaultBatteryManagerModule::class, DefaultEventExecutorModule::class, @@ -54,10 +49,7 @@ import javax.inject.Singleton HeadlessContactModule::class, HeadlessEventModule::class, HeadlessForumModule::class, - HeadlessMessagingModule::class, - JavaNetworkModule::class, - JavaSystemModule::class, - SocksModule::class + HeadlessMessagingModule::class ] ) internal class HeadlessModule(private val appDir: File) { diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt index 89e69fae7..ace7d937d 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt @@ -3,6 +3,7 @@ package org.briarproject.briar.headless import dagger.Component import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.bramble.BrambleCoreModule +import org.briarproject.bramble.BrambleJavaModule import org.briarproject.bramble.api.crypto.CryptoComponent import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.BriarCoreModule @@ -12,6 +13,7 @@ import javax.inject.Singleton @Component( modules = [ BrambleCoreModule::class, + BrambleJavaModule::class, BriarCoreModule::class, HeadlessTestModule::class ] diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt index 3c0da66aa..2725b70a5 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt @@ -15,13 +15,9 @@ import org.briarproject.bramble.api.plugin.TransportId import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory import org.briarproject.bramble.event.DefaultEventExecutorModule -import org.briarproject.bramble.network.JavaNetworkModule -import org.briarproject.bramble.plugin.tor.CircumventionModule -import org.briarproject.bramble.socks.SocksModule import org.briarproject.bramble.system.ClockModule import org.briarproject.bramble.system.DefaultTaskSchedulerModule import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule -import org.briarproject.bramble.system.JavaSystemModule import org.briarproject.bramble.test.TestFeatureFlagModule import org.briarproject.bramble.test.TestSecureRandomModule import org.briarproject.briar.api.test.TestAvatarCreator @@ -36,15 +32,11 @@ import javax.inject.Singleton @Module( includes = [ - JavaNetworkModule::class, - JavaSystemModule::class, AccountModule::class, - CircumventionModule::class, ClockModule::class, DefaultEventExecutorModule::class, DefaultTaskSchedulerModule::class, DefaultWakefulIoExecutorModule::class, - SocksModule::class, TestFeatureFlagModule::class, TestSecureRandomModule::class, HeadlessBlogModule::class,