Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Don't advertise support for disappearing messages unless flag is enabled.

Browse Source
This commit is contained in:
akwizgran
2021-03-01 16:46:08 +00:00
committed by Torsten Grote
parent 112dace96c
commit 654603cfad
1 changed files with 7 additions and 2 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

@@ -1,5 +1,6 @@
package org.briarproject.briar.messaging; package org.briarproject.briar.messaging;
import org.briarproject.bramble.api.FeatureFlags;
import org.briarproject.bramble.api.cleanup.CleanupManager; import org.briarproject.bramble.api.cleanup.CleanupManager;
import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.data.BdfReaderFactory; import org.briarproject.bramble.api.data.BdfReaderFactory;
@@ -56,15 +57,19 @@ public class MessagingModule {
ContactManager contactManager, ValidationManager validationManager, ContactManager contactManager, ValidationManager validationManager,
ConversationManager conversationManager, ConversationManager conversationManager,
ClientVersioningManager clientVersioningManager, ClientVersioningManager clientVersioningManager,
CleanupManager cleanupManager, CleanupManager cleanupManager, FeatureFlags featureFlags,
MessagingManagerImpl messagingManager) { MessagingManagerImpl messagingManager) {
lifecycleManager.registerOpenDatabaseHook(messagingManager); lifecycleManager.registerOpenDatabaseHook(messagingManager);
contactManager.registerContactHook(messagingManager); contactManager.registerContactHook(messagingManager);
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
// feature flag is enabled
int minorVersion = featureFlags.shouldEnableDisappearingMessages()
? MINOR_VERSION : 2;
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION, clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
MINOR_VERSION, messagingManager); minorVersion, messagingManager);
cleanupManager.registerCleanupHook(CLIENT_ID, MAJOR_VERSION, cleanupManager.registerCleanupHook(CLIENT_ID, MAJOR_VERSION,
messagingManager); messagingManager);
return messagingManager; return messagingManager;