From 30261b0dcf86bd5e8023f423fe8408829675e4e5 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 3 Dec 2020 14:15:12 +0000
Subject: [PATCH] Send current minor version of messaging client to contacts.

---
 .../briarproject/briar/messaging/MessagingModule.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java
index 945142ef6..c9a55cff8 100644
--- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java
+++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java
@@ -1,6 +1,5 @@
 package org.briarproject.briar.messaging;
 
-import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.data.BdfReaderFactory;
 import org.briarproject.bramble.api.data.MetadataEncoder;
@@ -20,6 +19,7 @@ import dagger.Provides;
 
 import static org.briarproject.briar.api.messaging.MessagingManager.CLIENT_ID;
 import static org.briarproject.briar.api.messaging.MessagingManager.MAJOR_VERSION;
+import static org.briarproject.briar.api.messaging.MessagingManager.MINOR_VERSION;
 
 @Module
 public class MessagingModule {
@@ -57,17 +57,14 @@ public class MessagingModule {
 			ContactManager contactManager, ValidationManager validationManager,
 			ConversationManager conversationManager,
 			ClientVersioningManager clientVersioningManager,
-			FeatureFlags featureFlags, MessagingManagerImpl messagingManager) {
+			MessagingManagerImpl messagingManager) {
 		lifecycleManager.registerOpenDatabaseHook(messagingManager);
 		contactManager.registerContactHook(messagingManager);
 		validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
 				messagingManager);
 		conversationManager.registerConversationClient(messagingManager);
-		// Advertise the current or previous minor version depending on the
-		// feature flag
-		int minorVersion = featureFlags.shouldEnableImageAttachments() ? 2 : 0;
 		clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
-				minorVersion, messagingManager);
+				MINOR_VERSION, messagingManager);
 		return messagingManager;
 	}