diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java index 02f2876b0edd4f73fb27e8fa3f7f4ff96f267ea5..ed9bc88f225a4a781a1c3217e90e7aca67282251 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java @@ -57,7 +57,6 @@ import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE; import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED; import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE; import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED; -import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID; import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING; import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN; import static org.briarproject.bramble.db.DatabaseConstants.DB_SETTINGS_NAMESPACE; @@ -1681,7 +1680,7 @@ abstract class JdbcDatabase implements Database<Connection> { GroupId dependentGroupId = new GroupId(rs.getBytes(3)); GroupId dependencyGroupId = new GroupId(rs.getBytes(4)); if (!dependentGroupId.equals(dependencyGroupId)) - state = INVALID; // Dependency in another group + state = UNKNOWN; // Dependency in another group } dependencies.put(dependency, state); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java index c21d5b26a4bd050b387a8a0f07cee7b9dfadc0d9..04244a310559e175423e1af604d314a3d8d037f9 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java @@ -1332,8 +1332,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { Map<MessageId, State> dependencies; dependencies = db.getMessageDependencies(txn, messageId); - // The cross-group dependency should have state INVALID - assertEquals(INVALID, dependencies.get(messageId1)); + // The cross-group dependency should have state UNKNOWN + assertEquals(UNKNOWN, dependencies.get(messageId1)); // The missing dependency should have state UNKNOWN assertEquals(UNKNOWN, dependencies.get(messageId2));