Merge branch '68-enable-private-message-deletion-in-release-builds' into 'master'

Enable private message deletion in release builds

See merge request briar/briar!1206

bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java

@@ -6,6 +6,4 @@ package org.briarproject.bramble.api;
 public interface FeatureFlags {
 
 	boolean shouldEnableImageAttachments();
-
-	boolean shouldEnablePrivateMessageDeletion();
 }

bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java

@@ -18,17 +18,6 @@ public class BrambleCoreIntegrationTestModule {
 
 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return new FeatureFlags() {
+		return () -> true;
-
-			@Override
-			public boolean shouldEnableImageAttachments() {
-				return true;
-			}
-
-			@Override
-			public boolean shouldEnablePrivateMessageDeletion() {
-				return true;
-			}
-		};
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -235,17 +235,6 @@ public class AppModule {
 
 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return new FeatureFlags() {
+		return () -> IS_DEBUG_BUILD;
-
-			@Override
-			public boolean shouldEnableImageAttachments() {
-				return IS_DEBUG_BUILD;
-			}
-
-			@Override
-			public boolean shouldEnablePrivateMessageDeletion() {
-				return IS_DEBUG_BUILD;
-			}
-		};
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -270,9 +270,7 @@ public class ConversationActivity extends BriarActivity
 		ConversationScrollListener scrollListener =
 				new ConversationScrollListener(adapter, viewModel);
 		list.getRecyclerView().addOnScrollListener(scrollListener);
-		if (featureFlags.shouldEnablePrivateMessageDeletion()) {
+		addSelectionTracker();
-			addSelectionTracker();
-		}
 
 		textInputView = findViewById(R.id.text_input_container);
 		if (featureFlags.shouldEnableImageAttachments()) {
@@ -378,11 +376,6 @@ public class ConversationActivity extends BriarActivity
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.conversation_actions, menu);
 
-		// Hide private message deletion action if feature is not enabled
-		if (!featureFlags.shouldEnablePrivateMessageDeletion()) {
-			menu.removeItem(R.id.action_delete_all_messages);
-		}
-
 		// enable introduction action if available
 		observeOnce(viewModel.showIntroductionAction(), this, enable -> {
 			if (enable != null && enable) {

briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt

@@ -96,8 +96,5 @@ internal class HeadlessModule(private val appDir: File) {
     internal fun provideObjectMapper() = ObjectMapper()
 
     @Provides
-    internal fun provideFeatureFlags() = object : FeatureFlags {
+    internal fun provideFeatureFlags() = FeatureFlags { false }
-        override fun shouldEnableImageAttachments() = false
-        override fun shouldEnablePrivateMessageDeletion() = true
-    }
 }

briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt

@@ -63,8 +63,5 @@ internal class HeadlessTestModule(private val appDir: File) {
     internal fun provideObjectMapper() = ObjectMapper()
 
     @Provides
-    internal fun provideFeatureFlags() = object : FeatureFlags {
+    internal fun provideFeatureFlags() = FeatureFlags { false }
-        override fun shouldEnableImageAttachments() = false
-        override fun shouldEnablePrivateMessageDeletion() = true
-    }
 }