From f3b4440105901c254ad3d294aa52efaa75e5dec7 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 2 Mar 2021 13:04:23 +0000 Subject: [PATCH] Don't advertise support for messaging features that are disabled by flags. --- .../briarproject/briar/messaging/MessagingModule.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 4776d0f80..d02744f4e 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 @@ -64,10 +64,11 @@ public class MessagingModule { validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION, messagingManager); conversationManager.registerConversationClient(messagingManager); - // Don't advertise support for disappearing messages unless the - // feature flag is enabled - int minorVersion = featureFlags.shouldEnableDisappearingMessages() - ? MINOR_VERSION : 2; + // Don't advertise support for image attachments or disappearing + // messages unless the respective feature flags are enabled + boolean images = featureFlags.shouldEnableImageAttachments(); + boolean disappear = featureFlags.shouldEnableDisappearingMessages(); + int minorVersion = images ? (disappear ? MINOR_VERSION : 2) : 0; clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION, minorVersion, messagingManager); cleanupManager.registerCleanupHook(CLIENT_ID, MAJOR_VERSION,