From 524c8d26f82526101d092e3c40a71410468d4c2e Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 7 May 2021 17:48:39 +0100 Subject: [PATCH] Don't inject default RemovableDrivePluginFactory on Android. --- .../java/org/briarproject/briar/android/AppModule.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 f5d13cf35..634c984b8 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 @@ -24,7 +24,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory; import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory; import org.briarproject.bramble.api.reporting.DevConfig; import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory; -import org.briarproject.bramble.plugin.file.RemovableDrivePluginFactory; import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory; import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory; import org.briarproject.bramble.util.AndroidUtils; @@ -68,6 +67,7 @@ import dagger.Provides; import static android.content.Context.MODE_PRIVATE; import static android.os.Build.VERSION.SDK_INT; import static java.util.Arrays.asList; +import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS; @@ -151,8 +151,7 @@ public class AppModule { @Provides @Singleton PluginConfig providePluginConfig(AndroidBluetoothPluginFactory bluetooth, - AndroidTorPluginFactory tor, AndroidLanTcpPluginFactory lan, - RemovableDrivePluginFactory drive) { + AndroidTorPluginFactory tor, AndroidLanTcpPluginFactory lan) { @NotNullByDefault PluginConfig pluginConfig = new PluginConfig() { @@ -163,7 +162,7 @@ public class AppModule { @Override public Collection getSimplexFactories() { - return singletonList(drive); + return emptyList(); } @Override