From 0dc8aa14104e4622bc881be20cb1989859025b22 Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:18:40 +1100
Subject: [PATCH] Fix control message issues on leaving group (#904)

---
 .../conversation/v2/messages/ControlMessageView.kt          | 6 ------
 .../org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index 22563b1ee2..8360ef1dba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -213,12 +213,6 @@ class ControlMessageView : LinearLayout {
                     }
                 }
             }
-            message.isGroupUpdateMessage -> {
-                val updateMessageData: UpdateMessageData? = UpdateMessageData.fromJSON(message.body)
-                if (updateMessageData?.isGroupErrorQuitKind() == true) {
-                    binding.textView.setTextColor(context.getColorFromAttr(R.attr.danger))
-                }
-            }
         }
 
         binding.textView.isGone = message.isCallLog
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
index 3615397efc..2a21e4b420 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
@@ -501,6 +501,8 @@ class GroupManagerV2Impl @Inject constructor(
                 } catch (e: Exception) {
                     storage.insertGroupInfoErrorQuit(groupId)
                     throw e
+                } finally {
+                    storage.deleteGroupInfoMessages(groupId, UpdateMessageData.Kind.GroupLeaving::class.java)
                 }
             }
         }