From 1996cc82e277e24a359d192e39c1623916989da4 Mon Sep 17 00:00:00 2001
From: Jubb <hjubb93@gmail.com>
Date: Tue, 16 Feb 2021 17:28:33 +1100
Subject: [PATCH] fix: non-admin self-leave now handled correctly

---
 .../securesms/loki/protocol/ClosedGroupsProtocolV2.kt       | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 bf12e073e0..fff03d6b74 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
@@ -626,8 +626,9 @@ object ClosedGroupsProtocolV2 {
         // If admin leaves the group is disbanded
         val didAdminLeave = admins.contains(senderPublicKey)
         val updatedMemberList = members - senderPublicKey
+        val userLeft = userPublicKey == senderPublicKey
 
-        if (didAdminLeave) {
+        if (didAdminLeave || userLeft) {
             disableLocalGroupAndUnsubscribe(context, apiDB, groupPublicKey, groupDB, groupID, userPublicKey)
         } else {
             val isCurrentUserAdmin = admins.contains(userPublicKey)
@@ -636,7 +637,8 @@ object ClosedGroupsProtocolV2 {
                 generateAndSendNewEncryptionKeyPair(context, groupPublicKey, updatedMemberList)
             }
         }
-        if (userPublicKey == senderPublicKey) {
+        // Notify user
+        if (userLeft) {
             val threadID = DatabaseFactory.getLokiThreadDatabase(context).getThreadID(groupID)
             insertOutgoingInfoMessage(context, groupID, GroupContext.Type.QUIT, name, members, admins, threadID, sentTimestamp)
         } else {