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

Merge branch '1606-bump-client-minor-version' into 'master'

Browse Source 
Bump client minor version to avoid triggering crash

Closes #1606

See merge request briar/briar!1150
This commit is contained in:
Torsten Grote
2019-06-28 13:28:37 +00:00
parent 4fd012c31a d145a082f5
commit 54c05b5ffe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
View File

@@ -30,7 +30,7 @@ public interface MessagingManager extends ConversationClient {
/**
* The current minor version of the messaging client.
*/
int MINOR_VERSION = 1;
int MINOR_VERSION = 2;
/**
* Stores a local private message.

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

@@ -65,7 +65,7 @@ public class MessagingModule {
conversationManager.registerConversationClient(messagingManager);
// Advertise the current or previous minor version depending on the
// feature flag
int minorVersion = featureFlags.shouldEnableImageAttachments() ? 1 : 0;
int minorVersion = featureFlags.shouldEnableImageAttachments() ? 2 : 0;
clientVersioningManager.registerClient(CLIENT_ID, MAJOR_VERSION,
minorVersion, messagingManager);
return messagingManager;