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

Tidy RestoreAccount

Browse Source
This commit is contained in:
ameba23
2021-04-23 13:22:10 +02:00
parent 3d34a36908
commit a5f0516135
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import java.security.GeneralSecurityException;
public interface RestoreAccount { public interface RestoreAccount {
int getNumberOfShards(); int getNumberOfShards();
boolean addReturnShardPayload(ReturnShardPayload toAdd); boolean addReturnShardPayload(ReturnShardPayload toAdd);
@@ -19,5 +20,5 @@ public interface RestoreAccount {
SocialBackup getSocialBackup(); SocialBackup getSocialBackup();
void addContactsToDb() throws InterruptedException, DbException; void addContactsToDb() throws DbException;
} }

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

@@ -2,9 +2,12 @@ package org.briarproject.briar.socialbackup.recovery;
import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.FormatException;
import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.Contact;
import org.briarproject.bramble.api.contact.ContactManager;
import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.briar.api.socialbackup.BackupPayload; import org.briarproject.briar.api.socialbackup.BackupPayload;
import org.briarproject.briar.api.socialbackup.ContactData; import org.briarproject.briar.api.socialbackup.ContactData;
@@ -17,26 +20,39 @@ import org.briarproject.briar.socialbackup.BackupPayloadDecoder;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
import static java.util.logging.Logger.getLogger;
public class RestoreAccountImpl implements RestoreAccount { public class RestoreAccountImpl implements RestoreAccount {
private ArrayList<ReturnShardPayload> recoveredShards = new ArrayList<>(); private final ArrayList<ReturnShardPayload> recoveredShards = new ArrayList<>();
private final DarkCrystal darkCrystal; private final DarkCrystal darkCrystal;
private final Executor ioExecutor;
private final DatabaseComponent db; private final DatabaseComponent db;
private final ContactManager contactManager;
private final LifecycleManager lifecycleManager; private final LifecycleManager lifecycleManager;
private SecretKey secretKey; private SecretKey secretKey;
private final BackupPayloadDecoder backupPayloadDecoder; private final BackupPayloadDecoder backupPayloadDecoder;
private SocialBackup socialBackup; private SocialBackup socialBackup;
private static final Logger LOG =
getLogger(RestoreAccountImpl.class.getName());
@Inject @Inject
RestoreAccountImpl(DarkCrystal darkCrystal, RestoreAccountImpl(DarkCrystal darkCrystal,
BackupPayloadDecoder backupPayloadDecoder, DatabaseComponent db, BackupPayloadDecoder backupPayloadDecoder, DatabaseComponent db,
@IoExecutor Executor ioExecutor,
ContactManager contactManager,
LifecycleManager lifecycleManager) { LifecycleManager lifecycleManager) {
this.darkCrystal = darkCrystal; this.darkCrystal = darkCrystal;
this.backupPayloadDecoder = backupPayloadDecoder; this.backupPayloadDecoder = backupPayloadDecoder;
this.db = db; this.db = db;
this.ioExecutor = ioExecutor;
this.lifecycleManager = lifecycleManager; this.lifecycleManager = lifecycleManager;
this.contactManager = contactManager;
} }
public int getNumberOfShards() { public int getNumberOfShards() {
@@ -57,7 +73,7 @@ public class RestoreAccountImpl implements RestoreAccount {
} }
public boolean canRecover() { public boolean canRecover() {
ArrayList<Shard> shards = new ArrayList(); ArrayList<Shard> shards = new ArrayList<>();
for (ReturnShardPayload returnShardPayload : recoveredShards) { for (ReturnShardPayload returnShardPayload : recoveredShards) {
// TODO check shards all have same secret id // TODO check shards all have same secret id
shards.add(returnShardPayload.getShard()); shards.add(returnShardPayload.getShard());
@@ -91,16 +107,30 @@ public class RestoreAccountImpl implements RestoreAccount {
return socialBackup; return socialBackup;
} }
public void addContactsToDb() throws InterruptedException, DbException { public void addContactsToDb() throws DbException {
if (socialBackup == null) throw new DbException(); if (socialBackup == null) throw new DbException();
// TODO maybe waitForDatabase should be in another thread AuthorId localAuthorId = socialBackup.getIdentity().getId();
lifecycleManager.waitForDatabase();
db.transaction(false, txn -> { ioExecutor.execute(() -> {
for (ContactData contactData : socialBackup.getContacts()) { try {
Contact c = contactData.getContact(); lifecycleManager.waitForDatabase();
db.addContact(txn, c.getAuthor(), c.getLocalAuthorId(), } catch (InterruptedException e) {
c.getHandshakePublicKey(), c.isVerified()); LOG.warning("Interrupted when waiting for database");
} }
try {
db.transaction(false, txn -> {
for (ContactData contactData : socialBackup.getContacts()) {
Contact c = contactData.getContact();
LOG.info("Adding contact " + c.getAuthor().getName() + " " + c.getAlias());
contactManager.addContact(txn, c.getAuthor(), localAuthorId,
c.getHandshakePublicKey(), c.isVerified());
}
});
} catch (DbException e) {
LOG.warning("Error adding contacts to database");
LOG.warning(e.getMessage());
}
LOG.info("Added all contacts");
}); });
} }
} }