From 15707b70604de27edb06125a17dd1b0bedf3aff5 Mon Sep 17 00:00:00 2001
From: Brice-W <brice@loki.network>
Date: Fri, 23 Apr 2021 16:35:24 +1000
Subject: [PATCH] fix encryption key pair handling

---
 .../messaging/sending_receiving/MessageReceiverHandler.kt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt
index 185befb9bd..8c08b879fb 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt
@@ -341,7 +341,8 @@ private fun MessageReceiver.handleClosedGroupEncryptionKeyPair(message: ClosedGr
     val storage = MessagingConfiguration.shared.storage
     val senderPublicKey = message.sender ?: return
     val kind = message.kind!! as? ClosedGroupControlMessage.Kind.EncryptionKeyPair ?: return
-    val groupPublicKey = kind.publicKey?.toByteArray()?.toHexString() ?: message.groupPublicKey ?: return
+    var groupPublicKey = kind.publicKey?.toByteArray()?.toHexString()
+    if (groupPublicKey.isNullOrEmpty()) groupPublicKey = message.groupPublicKey ?: return
     val userPublicKey = storage.getUserPublicKey()!!
     val userKeyPair = storage.getUserX25519KeyPair()
     // Unwrap the message