From ba5431b8064dac62cbf1a7ce913446385ea3cb76 Mon Sep 17 00:00:00 2001 From: jubb Date: Fri, 5 Feb 2021 10:27:24 +1100 Subject: [PATCH] fix: compile errors from moving keypair out of ClosedGroupsProtocolV2 --- .../loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt | 2 +- .../securesms/loki/protocol/ClosedGroupsProtocolV2.kt | 4 ++-- .../messaging/messages/control/ClosedGroupControlMessage.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt index e1e3928c44..3fcb203e74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt @@ -174,7 +174,7 @@ class ClosedGroupUpdateMessageSendJobV2 private constructor(parameters: Paramete closedGroupUpdate.type = SignalServiceProtos.ClosedGroupUpdateV2.Type.NEW closedGroupUpdate.publicKey = ByteString.copyFrom(kind.publicKey) closedGroupUpdate.name = kind.name - val encryptionKeyPair = SignalServiceProtos.ClosedGroupUpdateV2.KeyPair.newBuilder() + val encryptionKeyPair = SignalServiceProtos.KeyPair.newBuilder() encryptionKeyPair.publicKey = ByteString.copyFrom(kind.encryptionKeyPair.publicKey.serialize().removing05PrefixIfNeeded()) encryptionKeyPair.privateKey = ByteString.copyFrom(kind.encryptionKeyPair.privateKey.serialize()) closedGroupUpdate.encryptionKeyPair = encryptionKeyPair.build() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index b3b48ca1ad..1adc93d44d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -360,7 +360,7 @@ object ClosedGroupsProtocolV2 { // Generate the new encryption key pair val newKeyPair = Curve.generateKeyPair() // Distribute it - val proto = SignalServiceProtos.ClosedGroupUpdateV2.KeyPair.newBuilder() + val proto = SignalServiceProtos.KeyPair.newBuilder() proto.publicKey = ByteString.copyFrom(newKeyPair.publicKey.serialize().removing05PrefixIfNeeded()) proto.privateKey = ByteString.copyFrom(newKeyPair.privateKey.serialize()) val plaintext = proto.build().toByteArray() @@ -677,7 +677,7 @@ object ClosedGroupsProtocolV2 { val encryptedKeyPair = wrapper.encryptedKeyPair.toByteArray() val plaintext = SessionProtocolImpl(context).decrypt(encryptedKeyPair, userKeyPair).first // Parse it - val proto = SignalServiceProtos.ClosedGroupUpdateV2.KeyPair.parseFrom(plaintext) + val proto = SignalServiceProtos.KeyPair.parseFrom(plaintext) val keyPair = ECKeyPair(DjbECPublicKey(proto.publicKey.toByteArray().removing05PrefixIfNeeded()), DjbECPrivateKey(proto.privateKey.toByteArray())) // Store it apiDB.addClosedGroupEncryptionKeyPair(keyPair, groupPublicKey) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 8264800055..97b22ab0a7 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -118,7 +118,7 @@ class ClosedGroupControlMessage() : ControlMessage() { closedGroupUpdate.type = SignalServiceProtos.ClosedGroupUpdateV2.Type.NEW closedGroupUpdate.publicKey = kind.publicKey closedGroupUpdate.name = kind.name - val encryptionKeyPairAsProto = SignalServiceProtos.ClosedGroupUpdateV2.KeyPair.newBuilder() + val encryptionKeyPairAsProto = SignalServiceProtos.KeyPair.newBuilder() encryptionKeyPairAsProto.publicKey = ByteString.copyFrom(kind.encryptionKeyPair.publicKey.serialize()) encryptionKeyPairAsProto.privateKey = ByteString.copyFrom(kind.encryptionKeyPair.privateKey.serialize())