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

Bump client minor version to avoid triggering crash

Closes #1606

See merge request !1150

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.

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;