diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java index ba06f2a47..094b23edf 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java @@ -11,8 +11,6 @@ public interface FeatureFlags { boolean shouldEnableDisappearingMessages(); - boolean shouldEnableConnectViaBluetooth(); - boolean shouldEnableTransferData(); boolean shouldEnableShareAppViaOfflineHotspot(); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java index 10e0fc656..aca3c521e 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/TestFeatureFlagModule.java @@ -25,11 +25,6 @@ public class TestFeatureFlagModule { return true; } - @Override - public boolean shouldEnableConnectViaBluetooth() { - return true; - } - @Override public boolean shouldEnableTransferData() { return true; 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 a42f19bf5..2b059fa50 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 @@ -313,11 +313,6 @@ public class AppModule { return true; } - @Override - public boolean shouldEnableConnectViaBluetooth() { - return IS_DEBUG_BUILD; - } - @Override public boolean shouldEnableTransferData() { return IS_DEBUG_BUILD; 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 1bac397f9..9426e12cd 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 @@ -379,9 +379,6 @@ public class ConversationActivity extends BriarActivity this::showIntroductionOnboarding); } }); - if (!featureFlags.shouldEnableConnectViaBluetooth()) { - menu.findItem(R.id.action_connect_via_bluetooth).setVisible(false); - } // Transfer Data feature only supported on API 19+ if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) { menu.findItem(R.id.action_transfer_data).setVisible(true); 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 079bc4abd..e78797bb2 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 @@ -95,7 +95,6 @@ internal class HeadlessModule(private val appDir: File) { override fun shouldEnableImageAttachments() = false override fun shouldEnableProfilePictures() = false override fun shouldEnableDisappearingMessages() = false - override fun shouldEnableConnectViaBluetooth() = false override fun shouldEnableTransferData() = false override fun shouldEnableShareAppViaOfflineHotspot() = false }