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

Merge branch social-backup-poc

Browse Source
This commit is contained in:
ameba23
2021-05-31 13:43:43 +02:00
parent a448211549 4db1c4cc6b
commit 9c0a58e3ac
8 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,7 +279,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl
}
// Create the encrypted backup payload
SecretKey secret = crypto.generateSecretKey();
List<org.briarproject.briar.api.socialbackup.ContactData> contactData = loadContactData(txn);
List<ContactData> contactData = loadContactData(txn);
BackupPayload payload =
createBackupPayload(txn, secret, contactData, 0);
// Create the shards
@@ -423,7 +423,7 @@ class SocialBackupManagerImpl extends ConversationClientImpl
contactData, version);
}
private List<org.briarproject.briar.api.socialbackup.ContactData> loadContactData(Transaction txn)
private List<ContactData> loadContactData(Transaction txn)
throws DbException {
Collection<Contact> contacts = contactManager.getContacts(txn);
List<org.briarproject.briar.api.socialbackup.ContactData> contactData = new ArrayList<>();