From 065ceb8e98092ac9fc9d31af0e2e408b460c71db Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 8 Feb 2022 08:49:11 -0300 Subject: [PATCH] Add FeatureFlag for mailbox --- .../java/org/briarproject/bramble/api/FeatureFlags.java | 2 ++ .../briarproject/bramble/test/TestFeatureFlagModule.java | 5 +++++ .../main/java/org/briarproject/briar/android/AppModule.java | 6 ++++++ .../java/org/briarproject/briar/headless/HeadlessModule.kt | 1 + 4 files changed, 14 insertions(+) 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 df093059d..a857ac7ce 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,6 +11,8 @@ public interface FeatureFlags { boolean shouldEnableDisappearingMessages(); + boolean shouldEnableMailbox(); + boolean shouldEnablePrivateGroupsInCore(); boolean shouldEnableForumsInCore(); 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 6e867ffbe..c3f92b08a 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,6 +25,11 @@ public class TestFeatureFlagModule { return true; } + @Override + public boolean shouldEnableMailbox() { + return true; + } + @Override public boolean shouldEnablePrivateGroupsInCore() { 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 9e570d13a..e6682a751 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 @@ -31,6 +31,7 @@ import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory; import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory; import org.briarproject.bramble.util.AndroidUtils; import org.briarproject.bramble.util.StringUtils; +import org.briarproject.briar.BuildConfig; import org.briarproject.briar.android.account.DozeHelperModule; import org.briarproject.briar.android.account.LockManagerImpl; import org.briarproject.briar.android.account.SetupModule; @@ -340,6 +341,11 @@ public class AppModule { return true; } + @Override + public boolean shouldEnableMailbox() { + return BuildConfig.DEBUG; + } + @Override public boolean shouldEnablePrivateGroupsInCore() { return 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 bc08ed798..85cf884d3 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 @@ -107,6 +107,7 @@ internal class HeadlessModule(private val appDir: File) { override fun shouldEnableImageAttachments() = false override fun shouldEnableProfilePictures() = false override fun shouldEnableDisappearingMessages() = false + override fun shouldEnableMailbox() = false override fun shouldEnablePrivateGroupsInCore() = false override fun shouldEnableForumsInCore() = true override fun shouldEnableBlogsInCore() = true