From ed26dc0b2b28db1784f28ec8ce770dc9c5638b6a Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Nov 2021 17:05:26 +0000 Subject: [PATCH] Enable removable drives and sharing app offline in release builds. --- .../briarproject/bramble/api/FeatureFlags.java | 4 ---- .../bramble/test/TestFeatureFlagModule.java | 10 ---------- .../briarproject/briar/android/AppModule.java | 18 ++---------------- .../conversation/ConversationActivity.java | 2 +- .../android/settings/SettingsFragment.java | 6 ------ .../android/settings/SettingsViewModel.java | 4 ---- .../briar/headless/HeadlessModule.kt | 2 -- 7 files changed, 3 insertions(+), 43 deletions(-) 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 094b23edf..f0acbd8e1 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 @@ -10,8 +10,4 @@ public interface FeatureFlags { boolean shouldEnableProfilePictures(); boolean shouldEnableDisappearingMessages(); - - 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 aca3c521e..77f485e9b 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 @@ -24,16 +24,6 @@ public class TestFeatureFlagModule { public boolean shouldEnableDisappearingMessages() { return true; } - - @Override - public boolean shouldEnableTransferData() { - return true; - } - - @Override - public boolean shouldEnableShareAppViaOfflineHotspot() { - 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 2b059fa50..79268f2e3 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 @@ -76,7 +76,6 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS; import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX; -import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD; @Module(includes = { SetupModule.class, @@ -171,11 +170,8 @@ public class AppModule { @Override public Collection getSimplexFactories() { - if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) { - return singletonList(drive); - } else { - return emptyList(); - } + if (SDK_INT >= 19) return singletonList(drive); + else return emptyList(); } @Override @@ -312,16 +308,6 @@ public class AppModule { public boolean shouldEnableDisappearingMessages() { return true; } - - @Override - public boolean shouldEnableTransferData() { - return IS_DEBUG_BUILD; - } - - @Override - public boolean shouldEnableShareAppViaOfflineHotspot() { - 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 9426e12cd..512342fd0 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 @@ -380,7 +380,7 @@ public class ConversationActivity extends BriarActivity } }); // Transfer Data feature only supported on API 19+ - if (SDK_INT >= 19 && featureFlags.shouldEnableTransferData()) { + if (SDK_INT >= 19) { menu.findItem(R.id.action_transfer_data).setVisible(true); } // enable alias and bluetooth action once available diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 5f4fd2f16..c4d368db5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -86,12 +86,6 @@ public class SettingsFragment extends PreferenceFragmentCompat { PreferenceGroup dev = requireNonNull(findPreference(PREF_KEY_DEV)); dev.setVisible(false); } - - if (!viewModel.shouldEnableShareAppViaOfflineHotspot()) { - Preference shareApp = - requireNonNull(findPreference(PREF_KEY_SHARE_APP)); - shareApp.setVisible(false); - } } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java index f6aa3da2f..ba92042f0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsViewModel.java @@ -262,8 +262,4 @@ class SettingsViewModel extends DbViewModel implements EventListener { return screenLockTimeout; } - boolean shouldEnableShareAppViaOfflineHotspot() { - return featureFlags.shouldEnableShareAppViaOfflineHotspot(); - } - } 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 e78797bb2..0c3e66319 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,5 @@ internal class HeadlessModule(private val appDir: File) { override fun shouldEnableImageAttachments() = false override fun shouldEnableProfilePictures() = false override fun shouldEnableDisappearingMessages() = false - override fun shouldEnableTransferData() = false - override fun shouldEnableShareAppViaOfflineHotspot() = false } }