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

Merge branch '2320-mailbox-metadata-format-exception' into 'master'

Browse Source 
Bump major version of mailbox update client to avoid startup failure

Closes #2320

See merge request briar/briar!1647
This commit is contained in:
akwizgran
2022-05-26 12:45:55 +00:00
parent f75d63fc46 f08688708a
commit 845d505d2b
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java
View File

@@ -20,7 +20,7 @@ public interface MailboxUpdateManager {
/** /**
* The current major version of the mailbox update (properties) client. * The current major version of the mailbox update (properties) client.
*/ */
int MAJOR_VERSION = 1; int MAJOR_VERSION = 2;
/** /**
* The current minor version of the mailbox update (properties) client. * The current minor version of the mailbox update (properties) client.

31
bramble-core/src/main/java/org/briarproject/bramble/mailbox/MailboxModule.java
View File

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