From 4ecc5e4367788a46da0dadfc6bb7a10a16281657 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 6 May 2021 16:58:00 +0100 Subject: [PATCH] Clean up plugin injection code, remove unused module. --- .../AndroidBluetoothPluginFactory.java | 2 +- .../tcp/AndroidLanTcpPluginFactory.java | 2 +- .../plugin/tor/AndroidTorPluginFactory.java | 2 +- .../bramble/plugin/DesktopPluginModule.java | 61 ------------------- .../plugin/tor/UnixTorPluginFactory.java | 2 +- .../briarproject/briar/android/AppModule.java | 1 + .../briar/headless/HeadlessModule.kt | 1 + .../briar/headless/HeadlessTestModule.kt | 1 + 8 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java index 96f094d72..b7c7e5731 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java @@ -47,7 +47,7 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory { private final BackoffFactory backoffFactory; @Inject - public AndroidBluetoothPluginFactory(@IoExecutor Executor ioExecutor, + AndroidBluetoothPluginFactory(@IoExecutor Executor ioExecutor, @WakefulIoExecutor Executor wakefulIoExecutor, AndroidExecutor androidExecutor, AndroidWakeLockManager wakeLockManager, diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java index beedd97a4..01922de50 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java @@ -37,7 +37,7 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory { private final Application app; @Inject - public AndroidLanTcpPluginFactory(@IoExecutor Executor ioExecutor, + AndroidLanTcpPluginFactory(@IoExecutor Executor ioExecutor, @WakefulIoExecutor Executor wakefulIoExecutor, EventBus eventBus, BackoffFactory backoffFactory, diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java index 2a8bedfff..87552ed73 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java @@ -58,7 +58,7 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory { private final File torDirectory; @Inject - public AndroidTorPluginFactory(@IoExecutor Executor ioExecutor, + AndroidTorPluginFactory(@IoExecutor Executor ioExecutor, @WakefulIoExecutor Executor wakefulIoExecutor, Application app, NetworkManager networkManager, diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java deleted file mode 100644 index 6a33b933a..000000000 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/DesktopPluginModule.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.briarproject.bramble.plugin; - -import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.api.plugin.BluetoothConstants; -import org.briarproject.bramble.api.plugin.LanTcpConstants; -import org.briarproject.bramble.api.plugin.PluginConfig; -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.plugin.bluetooth.JavaBluetoothPluginFactory; -import org.briarproject.bramble.plugin.modem.ModemPluginFactory; -import org.briarproject.bramble.plugin.tcp.LanTcpPluginFactory; -import org.briarproject.bramble.plugin.tcp.WanTcpPluginFactory; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import dagger.Module; -import dagger.Provides; - -import static java.util.Arrays.asList; -import static java.util.Collections.emptyList; -import static java.util.Collections.singletonList; -import static java.util.Collections.singletonMap; - -@Module -public class DesktopPluginModule extends PluginModule { - - @Provides - PluginConfig getPluginConfig(JavaBluetoothPluginFactory bluetooth, - ModemPluginFactory modem, LanTcpPluginFactory lan, - WanTcpPluginFactory wan) { - @NotNullByDefault - PluginConfig pluginConfig = new PluginConfig() { - - @Override - public Collection getDuplexFactories() { - return asList(bluetooth, modem, lan, wan); - } - - @Override - public Collection getSimplexFactories() { - return emptyList(); - } - - @Override - public boolean shouldPoll() { - return true; - } - - @Override - public Map> getTransportPreferences() { - // Prefer LAN to Bluetooth - return singletonMap(BluetoothConstants.ID, - singletonList(LanTcpConstants.ID)); - } - }; - return pluginConfig; - } -} diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java index e279d56be..3d8d91a32 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java @@ -56,7 +56,7 @@ public class UnixTorPluginFactory implements DuplexPluginFactory { private final File torDirectory; @Inject - public UnixTorPluginFactory(@IoExecutor Executor ioExecutor, + UnixTorPluginFactory(@IoExecutor Executor ioExecutor, @WakefulIoExecutor Executor wakefulIoExecutor, NetworkManager networkManager, LocationUtils locationUtils, diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java index 6a29a00d9..f5d13cf35 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AppModule.java @@ -149,6 +149,7 @@ public class AppModule { } @Provides + @Singleton PluginConfig providePluginConfig(AndroidBluetoothPluginFactory bluetooth, AndroidTorPluginFactory tor, AndroidLanTcpPluginFactory lan, RemovableDrivePluginFactory drive) { 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 58c217d4a..90afe01c5 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 @@ -74,6 +74,7 @@ internal class HeadlessModule(private val appDir: File) { } @Provides + @Singleton internal fun providePluginConfig(tor: UnixTorPluginFactory): PluginConfig { val duplex: List = if (isLinux() || isMac()) listOf(tor) else emptyList() 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 c76212827..f31caf2e3 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 @@ -64,6 +64,7 @@ internal class HeadlessTestModule(private val appDir: File) { } @Provides + @Singleton internal fun providePluginConfig(): PluginConfig { return object : PluginConfig { override fun getDuplexFactories(): Collection = emptyList()