Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'messaging-module-feature-flags' into '804-self-destructing-messages'

Browse Source 
Don't advertise support for messaging features that are disabled by flags

See merge request briar/briar!1390
This commit is contained in:
Torsten Grote
2021-03-08 11:47:09 +00:00
parent ad67a0abd6 f3b4440105
commit 03c55311c7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingModule.java
View File

@@ -64,10 +64,11 @@ public class MessagingModule {
validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION, validationManager.registerIncomingMessageHook(CLIENT_ID, MAJOR_VERSION,
messagingManager); messagingManager);
conversationManager.registerConversationClient(messagingManager); conversationManager.registerConversationClient(messagingManager);
// Don't advertise support for disappearing messages unless the // Don't advertise support for image attachments or disappearing
// feature flag is enabled // messages unless the respective feature flags are enabled
int minorVersion = featureFlags.shouldEnableDisappearingMessages() boolean images = featureFlags.shouldEnableImageAttachments();
? MINOR_VERSION : 2; boolean disappear = featureFlags.shouldEnableDisappearingMessages();
int minorVersion = images ? (disappear ? MINOR_VERSION : 2) : 0;
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION, clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
minorVersion, messagingManager); minorVersion, messagingManager);
cleanupManager.registerCleanupHook(CLIENT_ID, MAJOR_VERSION, cleanupManager.registerCleanupHook(CLIENT_ID, MAJOR_VERSION,