From c37f6069c7a9c074e7094b0b2beddb7a1d0982fb Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 23 May 2022 16:11:27 +0100
Subject: [PATCH] Use feature flag to enable mailbox sync client.

---
 .../bramble/mailbox/MailboxModule.java        | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
index d4969c8cb..590a7f857 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
@@ -1,5 +1,6 @@
 package org.briarproject.bramble.mailbox;
 
+import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.data.MetadataEncoder;
@@ -61,12 +62,17 @@ public class MailboxModule {
 	@Provides
 	@Singleton
 	MailboxUpdateValidator provideMailboxUpdateValidator(
-			ValidationManager validationManager, ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock) {
+			ValidationManager validationManager,
+			ClientHelper clientHelper,
+			MetadataEncoder metadataEncoder,
+			Clock clock,
+			FeatureFlags featureFlags) {
 		MailboxUpdateValidator validator = new MailboxUpdateValidator(
 				clientHelper, metadataEncoder, clock);
-		validationManager.registerMessageValidator(CLIENT_ID, MAJOR_VERSION,
-				validator);
+		if (featureFlags.shouldEnableMailbox()) {
+			validationManager.registerMessageValidator(CLIENT_ID,
+					MAJOR_VERSION, validator);
+		}
 		return validator;
 	}
 
@@ -78,18 +84,21 @@ public class MailboxModule {
 	@Provides
 	@Singleton
 	MailboxUpdateManager provideMailboxUpdateManager(
+			FeatureFlags featureFlags,
 			LifecycleManager lifecycleManager,
 			ValidationManager validationManager, ContactManager contactManager,
 			ClientVersioningManager clientVersioningManager,
 			MailboxSettingsManager mailboxSettingsManager,
 			MailboxUpdateManagerImpl mailboxUpdateManager) {
-		lifecycleManager.registerOpenDatabaseHook(mailboxUpdateManager);
-		validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
-				mailboxUpdateManager);
-		contactManager.registerContactHook(mailboxUpdateManager);
-		clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
-				MINOR_VERSION, mailboxUpdateManager);
-		mailboxSettingsManager.registerMailboxHook(mailboxUpdateManager);
+		if (featureFlags.shouldEnableMailbox()) {
+			lifecycleManager.registerOpenDatabaseHook(mailboxUpdateManager);
+			validationManager.registerIncomingMessageHook(CLIENT_ID,
+					MAJOR_VERSION, mailboxUpdateManager);
+			contactManager.registerContactHook(mailboxUpdateManager);
+			clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
+					MINOR_VERSION, mailboxUpdateManager);
+			mailboxSettingsManager.registerMailboxHook(mailboxUpdateManager);
+		}
 		return mailboxUpdateManager;
 	}
 }