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

Include local tor properties in backup and check for remote handshake public keys

Browse Source
This commit is contained in:
ameba23
2021-06-25 13:03:45 +02:00
parent ef05ecc342
commit f67d2f0157
9 changed files with 137 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackup.java
View File

@@ -1,17 +1,22 @@
package org.briarproject.briar.api.socialbackup;
import org.briarproject.bramble.api.identity.Identity;
import org.briarproject.bramble.api.plugin.TransportId;
import org.briarproject.bramble.api.properties.TransportProperties;
import java.util.List;
import java.util.Map;
public class SocialBackup {
private Identity identity;
private List<ContactData> contacts;
private Map<TransportId, TransportProperties> localTransportProperties;
private int version;
public SocialBackup (Identity identity, List<ContactData> contacts, int version) {
public SocialBackup (Identity identity, List<ContactData> contacts, Map<TransportId, TransportProperties> localTransportProperties, int version) {
this.identity = identity;
this.contacts = contacts;
this.localTransportProperties = localTransportProperties;
this.version = version;
}
@@ -23,6 +28,10 @@ public class SocialBackup {
return contacts;
}
public Map<TransportId, TransportProperties> getLocalTransportProperties() {
return localTransportProperties;
}
public int getVersion() {
return version;
}

6
briar-api/src/main/java/org/briarproject/briar/api/socialbackup/recovery/RestoreAccount.java
View File

@@ -29,7 +29,11 @@ public interface RestoreAccount {
SocialBackup getSocialBackup();
void addContactsToDb() throws DbException;
// void addContactsToDb() throws DbException;
void restoreFromPrevious(Set<String> previousShards);
void restoreAccountWhenDatabaseReady() throws DbException;
// void addLocalTransportProperties() throws DbException;
}