From d145a082f5a85c315e896715c7fe45f710da258b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 28 Jun 2019 14:07:28 +0100
Subject: [PATCH] Bump client minor version to avoid triggering crash.
---
.../org/briarproject/briar/api/messaging/MessagingManager.java | 2 +-
.../java/org/briarproject/briar/messaging/MessagingModule.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
index d4c6074d4d..0dfecb8ab3 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java
@@ -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.
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 17b77ef390..945142ef6b 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
@@ -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;
--
GitLab