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

Fix dependency problems after refactor

Browse Source
This commit is contained in:
ameba23
2021-04-22 09:01:44 +02:00
parent 4b77a9ab60
commit 2e03967519
8 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/main/java/org/briarproject/briar/socialbackup/BackupPayloadEncoder.java
View File

@@ -3,12 +3,14 @@ package org.briarproject.briar.socialbackup;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.identity.Identity;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.socialbackup.BackupPayload;
import org.briarproject.briar.api.socialbackup.ContactData;
import java.util.List;
@NotNullByDefault
interface BackupPayloadEncoder {
org.briarproject.briar.api.socialbackup.BackupPayload encodeBackupPayload(SecretKey secret, Identity identity,
List<org.briarproject.briar.api.socialbackup.ContactData> contactData, int version);
BackupPayload encodeBackupPayload(SecretKey secret, Identity identity,
List<ContactData> contactData, int version);
}

9
briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupManagerImpl.java
View File

@@ -52,6 +52,7 @@ import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
import org.briarproject.briar.api.socialbackup.ShardReceivedEvent;
import org.briarproject.briar.api.socialbackup.SocialBackupManager;
import org.briarproject.briar.client.ConversationClientImpl;
import org.briarproject.briar.api.socialbackup.ContactData;
import java.util.ArrayList;
import java.util.Collection;
@@ -193,12 +194,12 @@ class SocialBackupManagerImpl extends ConversationClientImpl
// Add the shard to our backup, if any
if (localBackupExists(txn)) {
Shard shard = messageParser.parseShardMessage(body);
List<org.briarproject.briar.api.socialbackup.ContactData> contactData = loadContactData(txn);
ListIterator<org.briarproject.briar.api.socialbackup.ContactData> it = contactData.listIterator();
List<ContactData> contactData = loadContactData(txn);
ListIterator<ContactData> it = contactData.listIterator();
while (it.hasNext()) {
org.briarproject.briar.api.socialbackup.ContactData cd = it.next();
ContactData cd = it.next();
if (cd.getContact().getId().equals(contactId)) {
it.set(new org.briarproject.briar.api.socialbackup.ContactData(cd.getContact(),
it.set(new ContactData(cd.getContact(),
cd.getProperties(), shard));
updateBackup(txn, contactData);
break;

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

@@ -61,7 +61,7 @@ public class RestoreAccountImpl implements RestoreAccount {
public int recover() throws FormatException, GeneralSecurityException {
if (secretKey == null) throw new GeneralSecurityException();
// Find backup with highest version number
int highestVersion = 0;
int highestVersion = -1;
for (ReturnShardPayload returnShardPayload : recoveredShards) {
BackupPayload backupPayload = returnShardPayload.getBackupPayload();
SocialBackup s = backupPayloadDecoder.decodeBackupPayload(secretKey, backupPayload);