From 7c6a2a9b46025d723e9e5edbe8250b5d561b4e6b Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 30 Mar 2021 12:05:18 +0200 Subject: [PATCH] Refactor from public contact exchange code --- .../bramble/contact/ContactExchangeCryptoImpl.java | 13 +++++++------ .../bramble/contact/ContactExchangeManagerImpl.java | 8 +++++--- .../briarproject/bramble/contact/ContactModule.java | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java index 6a3a3c44a..33a04cbe5 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeCryptoImpl.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.contact; +import org.briarproject.bramble.api.contact.ContactExchangeCrypto; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.PrivateKey; import org.briarproject.bramble.api.crypto.PublicKey; @@ -10,12 +11,12 @@ import java.security.GeneralSecurityException; import javax.inject.Inject; -import static org.briarproject.bramble.contact.ContactExchangeConstants.ALICE_KEY_LABEL; -import static org.briarproject.bramble.contact.ContactExchangeConstants.ALICE_NONCE_LABEL; -import static org.briarproject.bramble.contact.ContactExchangeConstants.BOB_KEY_LABEL; -import static org.briarproject.bramble.contact.ContactExchangeConstants.BOB_NONCE_LABEL; -import static org.briarproject.bramble.contact.ContactExchangeConstants.PROTOCOL_VERSION; -import static org.briarproject.bramble.contact.ContactExchangeConstants.SIGNING_LABEL; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.ALICE_KEY_LABEL; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.ALICE_NONCE_LABEL; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.BOB_KEY_LABEL; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.BOB_NONCE_LABEL; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.PROTOCOL_VERSION; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.SIGNING_LABEL; @NotNullByDefault class ContactExchangeCryptoImpl implements ContactExchangeCrypto { diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java index 9e3bd03a7..5e56d25c8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeManagerImpl.java @@ -4,6 +4,7 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.Predicate; import org.briarproject.bramble.api.client.ClientHelper; import org.briarproject.bramble.api.contact.Contact; +import org.briarproject.bramble.api.contact.ContactExchangeCrypto; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -47,8 +48,8 @@ import javax.inject.Inject; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH; -import static org.briarproject.bramble.contact.ContactExchangeConstants.PROTOCOL_VERSION; -import static org.briarproject.bramble.contact.ContactExchangeRecordTypes.CONTACT_INFO; +import static org.briarproject.bramble.api.contact.ContactExchangeConstants.PROTOCOL_VERSION; +import static org.briarproject.bramble.api.contact.ContactExchangeRecordTypes.CONTACT_INFO; import static org.briarproject.bramble.util.ValidationUtils.checkLength; import static org.briarproject.bramble.util.ValidationUtils.checkSize; @@ -81,7 +82,8 @@ class ContactExchangeManagerImpl implements ContactExchangeManager { private final ContactManager contactManager; private final IdentityManager identityManager; private final TransportPropertyManager transportPropertyManager; - private final ContactExchangeCrypto contactExchangeCrypto; + private final org.briarproject.bramble.api.contact.ContactExchangeCrypto + contactExchangeCrypto; private final StreamReaderFactory streamReaderFactory; private final StreamWriterFactory streamWriterFactory; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java index f0b5b6259..622a2f95e 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactModule.java @@ -1,5 +1,6 @@ package org.briarproject.bramble.contact; +import org.briarproject.bramble.api.contact.ContactExchangeCrypto; import org.briarproject.bramble.api.contact.ContactExchangeManager; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.contact.HandshakeManager;