From a7e255091bc4d236b532418be3ab802f2b78fd46 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Fri, 19 Apr 2024 07:43:15 +1000
Subject: [PATCH] Implemented PR feedback

---
 .../securesms/database/Storage.kt             | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 9bc1195f74..354ec05c46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1378,25 +1378,22 @@ open class Storage(
             return
         }
 
-        when {
-            // Note: We don't do anything if the thread is a 1-on-1 and the recipient is a contact
-            // of ours (i.e., when recipient.isContactRecipient)
+        // There is nothing further we need to do if this is a 1-on-1 conversation, and it's not
+        // possible to delete communities in this manner so bail.
+        if (recipient.isContactRecipient || recipient.isCommunityRecipient) return
 
-            recipient.isClosedGroupRecipient -> {
-                // TODO: handle closed group
-                val volatile = configFactory.convoVolatile ?: return
-                val groups = configFactory.userGroups ?: return
-                val groupID = recipient.address.toGroupString()
-                val closedGroup = getGroup(groupID)
-                val groupPublicKey = GroupUtil.doubleDecodeGroupId(recipient.address.serialize())
-                if (closedGroup != null) {
-                    groupDB.delete(groupID) // TODO: Should we delete the group? (seems odd to leave it)
-                    volatile.eraseLegacyClosedGroup(groupPublicKey)
-                    groups.eraseLegacyGroup(groupPublicKey)
-                } else {
-                    Log.w("Loki-DBG", "Failed to find a closed group for ${groupPublicKey.take(4)}")
-                }
-            }
+        // If we get here then this is a closed group conversation (i.e., recipient.isClosedGroupRecipient)
+        val volatile = configFactory.convoVolatile ?: return
+        val groups = configFactory.userGroups ?: return
+        val groupID = recipient.address.toGroupString()
+        val closedGroup = getGroup(groupID)
+        val groupPublicKey = GroupUtil.doubleDecodeGroupId(recipient.address.serialize())
+        if (closedGroup != null) {
+            groupDB.delete(groupID)
+            volatile.eraseLegacyClosedGroup(groupPublicKey)
+            groups.eraseLegacyGroup(groupPublicKey)
+        } else {
+            Log.w("Loki-DBG", "Failed to find a closed group for ${groupPublicKey.take(4)}")
         }
     }