From 693478e0a5ec15542d9b82d2a59504281f2dd48f Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Mar 2021 16:42:28 +0000 Subject: [PATCH] Add feature flag for self-destructing messages. --- .../main/java/org/briarproject/bramble/api/FeatureFlags.java | 1 + .../bramble/test/BrambleCoreIntegrationTestModule.java | 5 +++++ .../main/java/org/briarproject/briar/android/AppModule.java | 5 +++++ .../java/org/briarproject/briar/headless/HeadlessModule.kt | 1 + .../org/briarproject/briar/headless/HeadlessTestModule.kt | 1 + 5 files changed, 13 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 daf9858db..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 @@ -9,4 +9,5 @@ public interface FeatureFlags { boolean shouldEnableProfilePictures(); + boolean shouldEnableDisappearingMessages(); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java index 7caf6c131..661df400a 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java @@ -33,6 +33,11 @@ public class BrambleCoreIntegrationTestModule { public boolean shouldEnableProfilePictures() { return true; } + + @Override + public boolean shouldEnableDisappearingMessages() { + 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 6d8507600..9a75f6e2e 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 @@ -293,6 +293,11 @@ public class AppModule { public boolean shouldEnableProfilePictures() { return IS_DEBUG_BUILD; } + + @Override + public boolean shouldEnableDisappearingMessages() { + return IS_DEBUG_BUILD; + } }; } } 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 029754d5e..e004bdca4 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 @@ -93,5 +93,6 @@ internal class HeadlessModule(private val appDir: File) { internal fun provideFeatureFlags() = object : FeatureFlags { override fun shouldEnableImageAttachments() = false override fun shouldEnableProfilePictures() = false + override fun shouldEnableDisappearingMessages() = false } } diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt index 028f7db38..e299158b7 100644 --- a/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt +++ b/briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt @@ -81,6 +81,7 @@ internal class HeadlessTestModule(private val appDir: File) { internal fun provideFeatureFlags() = object : FeatureFlags { override fun shouldEnableImageAttachments() = false override fun shouldEnableProfilePictures() = false + override fun shouldEnableDisappearingMessages() = false } @Provides