From c740963fe24c47fb89a2b8d65cf215f2fe409564 Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Mon, 22 Feb 2021 10:34:21 +1100
Subject: [PATCH] fix: use a when to make logic more readable

---
 .../securesms/loki/protocol/ClosedGroupsProtocolV2.kt  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 e6998a97c5..c67719cfa7 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
@@ -616,10 +616,12 @@ object ClosedGroupsProtocolV2 {
         val userKeyPair = apiDB.getUserX25519KeyPair()
         // Unwrap the message
         val groupDB = DatabaseFactory.getGroupDatabase(context)
-        val groupID = if (groupPublicKey.isEmpty() && !closedGroupUpdate.publicKey.isEmpty) {
-            doubleEncodeGroupID(closedGroupUpdate.publicKey.toStringUtf8())
-        } else {
-            doubleEncodeGroupID(groupPublicKey)
+        val groupID = when {
+            groupPublicKey.isNotEmpty() -> groupPublicKey
+            !closedGroupUpdate.publicKey.isEmpty -> closedGroupUpdate.publicKey.toStringUtf8()
+            else -> ""
+        }.let {
+            doubleEncodeGroupID(it)
         }
         val group = groupDB.getGroup(groupID).orNull()
         if (group == null) {