Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Use backup with highest version number

Browse Source
This commit is contained in:
ameba23
2021-04-21 21:53:06 +02:00
parent 327cbe23ee
commit 4b77a9ab60
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/main/java/org/briarproject/briar/socialbackup/recovery/RestoreAccountImpl.java
View File

@@ -60,11 +60,17 @@ public class RestoreAccountImpl implements RestoreAccount {
public int recover() throws FormatException, GeneralSecurityException {
if (secretKey == null) throw new GeneralSecurityException();
// TODO find backup with highest version number
BackupPayload backupPayload = recoveredShards.get(0).getBackupPayload();
socialBackup = backupPayloadDecoder.decodeBackupPayload(secretKey, backupPayload);
int version = socialBackup.getVersion();
return version;
// Find backup with highest version number
int highestVersion = 0;
for (ReturnShardPayload returnShardPayload : recoveredShards) {
BackupPayload backupPayload = returnShardPayload.getBackupPayload();
SocialBackup s = backupPayloadDecoder.decodeBackupPayload(secretKey, backupPayload);
if (s.getVersion() > highestVersion) {
socialBackup = s;
highestVersion = s.getVersion();
}
}
return highestVersion;
}
public SocialBackup getSocialBackup() {