From aaba9f241796bbe5d34edfb3e0e229f090f205d4 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 14 Jul 2021 11:48:48 +0100 Subject: [PATCH] Don't configure plugin unless feature flag is enabled. --- .../java/org/briarproject/briar/android/AppModule.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 03ef767a9..cc3ca07f7 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 @@ -155,7 +155,8 @@ public class AppModule { @Singleton PluginConfig providePluginConfig(AndroidBluetoothPluginFactory bluetooth, AndroidTorPluginFactory tor, AndroidLanTcpPluginFactory lan, - AndroidRemovableDrivePluginFactory drive) { + AndroidRemovableDrivePluginFactory drive, + FeatureFlags featureFlags) { @NotNullByDefault PluginConfig pluginConfig = new PluginConfig() { @@ -166,7 +167,11 @@ public class AppModule { @Override public Collection getSimplexFactories() { - return SDK_INT >= 19 ? singletonList(drive) : emptyList(); + if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) { + return singletonList(drive); + } else { + return emptyList(); + } } @Override