From cf396c2ce202288a5270d41520814e8796a0e777 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 16 Apr 2018 14:50:52 +0100
Subject: [PATCH] Check whether contact group exists before using it.
---
.../briarproject/bramble/sync/ClientVersioningManagerImpl.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
index 5f51690a37..0e9d799892 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/ClientVersioningManagerImpl.java
@@ -96,6 +96,9 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
try {
Contact contact = db.getContact(txn, contactId);
Group g = getContactGroup(contact);
+ // Contact may be in the process of being added or removed, so
+ // contact group may not exist
+ if (!db.containsGroup(txn, g.getId())) return INVISIBLE;
LatestUpdates latest = findLatestUpdates(txn, g.getId());
if (latest.local == null) throw new DbException();
if (latest.remote == null) return INVISIBLE;
--
GitLab