Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Use remote states to update local states at startup.

Browse Source
This commit is contained in:
akwizgran
2018-04-24 15:43:45 +01:00
parent ebaa50b101
commit 36b191e9d4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java
View File

@@ -305,9 +305,15 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
Update oldLocalUpdate = loadUpdate(txn, latest.local.messageId); Update oldLocalUpdate = loadUpdate(txn, latest.local.messageId);
List<ClientState> oldLocalStates = oldLocalUpdate.states; List<ClientState> oldLocalStates = oldLocalUpdate.states;
long oldLocalUpdateVersion = oldLocalUpdate.updateVersion; long oldLocalUpdateVersion = oldLocalUpdate.updateVersion;
// Load and parse the latest remote update, if any
List<ClientState> remoteStates;
if (latest.remote == null) remoteStates = emptyList();
else remoteStates = loadUpdate(txn, latest.remote.messageId).states;
// Update the local states if necessary // Update the local states if necessary
List<ClientState> newLocalStates = List<ClientState> newLocalStates =
updateStatesFromLocalVersions(oldLocalStates, versions); updateStatesFromLocalVersions(oldLocalStates, versions);
newLocalStates = updateStatesFromRemoteStates(newLocalStates,
remoteStates);
if (!oldLocalStates.equals(newLocalStates)) { if (!oldLocalStates.equals(newLocalStates)) {
// Delete the latest local update // Delete the latest local update
db.deleteMessage(txn, latest.local.messageId); db.deleteMessage(txn, latest.local.messageId);
@@ -316,10 +322,6 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
storeUpdate(txn, g.getId(), newLocalStates, storeUpdate(txn, g.getId(), newLocalStates,
oldLocalUpdateVersion + 1); oldLocalUpdateVersion + 1);
} }
// Load and parse the latest remote update, if any
List<ClientState> remoteStates;
if (latest.remote == null) remoteStates = emptyList();
else remoteStates = loadUpdate(txn, latest.remote.messageId).states;
// Calculate the old and new client visibilities // Calculate the old and new client visibilities
Map<ClientMajorVersion, Visibility> before = Map<ClientMajorVersion, Visibility> before =
getVisibilities(oldLocalStates, remoteStates); getVisibilities(oldLocalStates, remoteStates);
@@ -442,7 +444,8 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
for (ClientState local : localStates) { for (ClientState local : localStates) {
ClientState remote = remoteMap.get(local.majorVersion); ClientState remote = remoteMap.get(local.majorVersion);
if (remote == null) visibilities.put(local.majorVersion, INVISIBLE); if (remote == null) visibilities.put(local.majorVersion, INVISIBLE);
else if (remote.active) visibilities.put(local.majorVersion, SHARED); else if (remote.active)
visibilities.put(local.majorVersion, SHARED);
else visibilities.put(local.majorVersion, VISIBLE); else visibilities.put(local.majorVersion, VISIBLE);
} }
return visibilities; return visibilities;