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

Call KeyManager#AddContact when restoring contacts

Browse Source
This commit is contained in:
ameba23
2021-06-29 11:43:14 +02:00
parent eb66a13ded
commit 4b9c3a1a96
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
View File

@@ -50,7 +50,8 @@ public interface ContactManager {
boolean active) throws DbException; boolean active) throws DbException;
ContactId addContact(Transaction txn, Author remote, AuthorId local, ContactId addContact(Transaction txn, Author remote, AuthorId local,
PublicKey handshake, boolean verified) throws DbException; PublicKey handshake, boolean verified)
throws DbException, GeneralSecurityException;
/** /**
* Stores a contact associated with the given local and remote pseudonyms, * Stores a contact associated with the given local and remote pseudonyms,
@@ -212,12 +213,14 @@ public interface ContactManager {
/** /**
* Sets the contact's handshake public key * Sets the contact's handshake public key
*/ */
void setHandshakePublicKey(Transaction txn, ContactId c, PublicKey handshakePublicKey) throws DbException; void setHandshakePublicKey(Transaction txn, ContactId c,
PublicKey handshakePublicKey) throws DbException;
/** /**
* Sets the contact's handshake public key * Sets the contact's handshake public key
*/ */
void setHandshakePublicKey(ContactId c, PublicKey handshakePublicKey) throws DbException; void setHandshakePublicKey(ContactId c, PublicKey handshakePublicKey)
throws DbException;
/** /**
* Returns true if a contact with this {@code remoteAuthorId} belongs to * Returns true if a contact with this {@code remoteAuthorId} belongs to

5
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
View File

@@ -122,9 +122,12 @@ class ContactManagerImpl implements ContactManager, EventListener {
@Override @Override
public ContactId addContact(Transaction txn, Author remote, AuthorId local, public ContactId addContact(Transaction txn, Author remote, AuthorId local,
PublicKey handshake, boolean verified) throws DbException { PublicKey handshake, boolean verified)
throws DbException, GeneralSecurityException {
ContactId c = db.addContact(txn, remote, local, handshake, verified); ContactId c = db.addContact(txn, remote, local, handshake, verified);
Contact contact = db.getContact(txn, c); Contact contact = db.getContact(txn, c);
KeyPair ourKeyPair = identityManager.getHandshakeKeys(txn);
keyManager.addContact(txn, c, handshake, ourKeyPair);
for (ContactHook hook : hooks) hook.addingContact(txn, contact); for (ContactHook hook : hooks) hook.addingContact(txn, contact);
return c; return c;
} }

4
briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java
View File

@@ -95,6 +95,8 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
for (Contact c : db.getContacts(txn)) { for (Contact c : db.getContacts(txn)) {
if (c.getHandshakePublicKey() == null) { if (c.getHandshakePublicKey() == null) {
sendHandshakePublicKey(txn, c); sendHandshakePublicKey(txn, c);
} else {
LOG.info("Have pk for contact " + c.getAuthor().getName());
} }
} }
} }
@@ -194,6 +196,8 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
if (c.getHandshakePublicKey() == null) { if (c.getHandshakePublicKey() == null) {
sendHandshakePublicKey(txn, c); sendHandshakePublicKey(txn, c);
} else {
LOG.info("Have pk for contact " + c.getAuthor().getName());
} }
} }

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

@@ -184,6 +184,9 @@ public class RestoreAccountImpl implements RestoreAccount {
} catch (DbException e) { } catch (DbException e) {
LOG.warning("Error adding contacts to database"); LOG.warning("Error adding contacts to database");
LOG.warning(e.getMessage()); LOG.warning(e.getMessage());
} catch (GeneralSecurityException e) {
LOG.warning("Error adding handshake key");
LOG.warning(e.getMessage());
} }
LOG.info("Added all contacts"); LOG.info("Added all contacts");
} }