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

Logging

Browse Source
This commit is contained in:
ameba23
2021-06-28 17:04:53 +02:00
parent fad9257066
commit 7563172121
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.data.MetadataParser;
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.db.Transaction; import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.identity.Identity;
import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group;
@@ -23,10 +22,8 @@ import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.Message;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.bramble.api.system.Clock; import org.briarproject.bramble.api.system.Clock;
import org.briarproject.bramble.api.versioning.ClientVersion;
import org.briarproject.bramble.api.versioning.ClientVersioningManager; import org.briarproject.bramble.api.versioning.ClientVersioningManager;
import org.briarproject.briar.api.client.MessageTracker; import org.briarproject.briar.api.client.MessageTracker;
import org.briarproject.briar.api.conversation.ConversationManager;
import org.briarproject.briar.api.conversation.ConversationMessageHeader; import org.briarproject.briar.api.conversation.ConversationMessageHeader;
import org.briarproject.briar.api.conversation.DeletionResult; import org.briarproject.briar.api.conversation.DeletionResult;
import org.briarproject.briar.api.handshakekeyexchange.HandshakeKeyExchangeManager; import org.briarproject.briar.api.handshakekeyexchange.HandshakeKeyExchangeManager;
@@ -61,7 +58,7 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
@Inject @Inject
protected HandshakeKeyExchangeManagerImpl ( protected HandshakeKeyExchangeManagerImpl(
DatabaseComponent db, DatabaseComponent db,
ClientHelper clientHelper, ClientHelper clientHelper,
MetadataParser metadataParser, MetadataParser metadataParser,
@@ -78,7 +75,8 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
this.contactManager = contactManager; this.contactManager = contactManager;
this.identityManager = identityManager; this.identityManager = identityManager;
this.clock = clock; this.clock = clock;
localGroup = contactGroupFactory.createLocalGroup(CLIENT_ID, MAJOR_VERSION); localGroup =
contactGroupFactory.createLocalGroup(CLIENT_ID, MAJOR_VERSION);
} }
@Override @Override
@@ -91,6 +89,7 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
// Set things up for any pre-existing contacts // Set things up for any pre-existing contacts
for (Contact c : db.getContacts(txn)) addingContact(txn, c); for (Contact c : db.getContacts(txn)) addingContact(txn, c);
LOG.info("HelloFromHandshake");
} }
@Override @Override
@@ -119,12 +118,6 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
} }
} }
@Override
public void setReadFlag(GroupId g, MessageId m, boolean read)
throws DbException {
}
@Override @Override
public DeletionResult deleteAllMessages(Transaction txn, ContactId c) public DeletionResult deleteAllMessages(Transaction txn, ContactId c)
throws DbException { throws DbException {
@@ -153,13 +146,15 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
BdfDictionary meta) throws DbException, FormatException { BdfDictionary meta) throws DbException, FormatException {
LOG.info("Incoming HandshakeKeyExchange message"); LOG.info("Incoming HandshakeKeyExchange message");
ContactId contactId = getContactId(txn, m.getGroupId()); ContactId contactId = getContactId(txn, m.getGroupId());
Contact c = contactManager.getContact(txn, contactId); Contact c = contactManager.getContact(txn, contactId);
if (c.getHandshakePublicKey() != null) { if (c.getHandshakePublicKey() != null) {
LOG.info("Already have public key - ignoring message"); LOG.info("Already have public key - ignoring message");
return false; return false;
} }
LOG.info("Adding contact's handshake public key");
PublicKey handshakePublicKey = new AgreementPublicKey(body.getRaw(0)); PublicKey handshakePublicKey = new AgreementPublicKey(body.getRaw(0));
contactManager.setHandshakePublicKey(txn, contactId, handshakePublicKey); contactManager
.setHandshakePublicKey(txn, contactId, handshakePublicKey);
return false; return false;
} }
@@ -169,7 +164,8 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
BdfDictionary meta = BdfDictionary meta =
clientHelper.getGroupMetadataAsDictionary(txn, g); clientHelper.getGroupMetadataAsDictionary(txn, g);
return new ContactId(meta.getLong( return new ContactId(meta.getLong(
HandshakeKeyExchangeConstants.GROUP_KEY_CONTACT_ID).intValue()); HandshakeKeyExchangeConstants.GROUP_KEY_CONTACT_ID)
.intValue());
} catch (FormatException e) { } catch (FormatException e) {
throw new DbException(e); throw new DbException(e);
} }
@@ -189,7 +185,7 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl
setContactId(txn, g.getId(), c.getId()); setContactId(txn, g.getId(), c.getId());
if (c.getHandshakePublicKey() == null) { if (c.getHandshakePublicKey() == null) {
sendHandshakePublicKey(txn, c); sendHandshakePublicKey(txn, c);
} }
} }