From 58ea9a1f48eccd24e8a6b26c25ce86ddee00f850 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Mon, 23 Mar 2026 11:58:43 -0400
Subject: [PATCH] Rename collapsed events for 1:1.

---
 .../securesms/conversation/ConversationUpdateItem.java    | 4 ++--
 .../thoughtcrime/securesms/database/CollapsibleEvents.kt  | 8 ++++----
 app/src/main/res/values/strings.xml                       | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 2cd2a4c3cf..c582744afd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -851,7 +851,7 @@ public final class ConversationUpdateItem extends FrameLayout
     return switch (type) {
       case CALL_EVENT -> R.string.CollapsedEvent__call_event;
       case DISAPPEARING_TIMER -> R.string.CollapsedEvent__disappearing_timer;
-      case GROUP_UPDATE -> R.string.CollapsedEvent__group_update;
+      case CHAT_UPDATE -> conversationRecipient.isGroup() ? R.string.CollapsedEvent__group_update : R.string.CollapsedEvent__chat_update;
     };
   }
 
@@ -859,7 +859,7 @@ public final class ConversationUpdateItem extends FrameLayout
     return switch (type) {
       case CALL_EVENT -> SignalSymbols.Glyph.PHONE;
       case DISAPPEARING_TIMER -> SignalSymbols.Glyph.TIMER;
-      case GROUP_UPDATE -> SignalSymbols.Glyph.GROUP;
+      case CHAT_UPDATE -> conversationRecipient.isGroup() ? SignalSymbols.Glyph.GROUP : SignalSymbols.Glyph.THREAD;
     };
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/CollapsibleEvents.kt b/app/src/main/java/org/thoughtcrime/securesms/database/CollapsibleEvents.kt
index 51222b3080..f552e7fa9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/CollapsibleEvents.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/CollapsibleEvents.kt
@@ -27,18 +27,18 @@ object CollapsibleEvents {
       return if (groupChangeUpdate?.updates?.any { it.groupExpirationTimerUpdate != null } == true) {
         CollapsibleType.DISAPPEARING_TIMER
       } else if (groupChangeUpdate?.updates?.none { it.groupTerminateChangeUpdate != null } == true) {
-        CollapsibleType.GROUP_UPDATE
+        CollapsibleType.CHAT_UPDATE
       } else {
         null
       }
     }
 
     if (MessageTypes.isProfileChange(type)) {
-      return CollapsibleType.GROUP_UPDATE
+      return CollapsibleType.CHAT_UPDATE
     }
 
     if (MessageTypes.isIdentityUpdate(type) || MessageTypes.isIdentityVerified(type) || MessageTypes.isIdentityDefault(type)) {
-      return CollapsibleType.GROUP_UPDATE
+      return CollapsibleType.CHAT_UPDATE
     }
 
     return null
@@ -46,7 +46,7 @@ object CollapsibleEvents {
 
   enum class CollapsibleType {
     DISAPPEARING_TIMER,
-    GROUP_UPDATE,
+    CHAT_UPDATE,
     CALL_EVENT
   }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de703b5f5e..fb090027eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3692,6 +3692,8 @@
     <string name="ConversationUpdateItem_update">Update</string>
     <!-- Update item button text to show how many group updates there are. -->
     <string name="CollapsedEvent__group_update">%1$d group updates</string>
+    <!-- Update item button text to show how many group updates there are. -->
+    <string name="CollapsedEvent__chat_update">%1$d chat updates</string>
     <!-- Update item button text to show how many disappearing message timer changes are. -->
     <string name="CollapsedEvent__disappearing_timer">%1$d disappearing message timer changes</string>
     <!-- Update item button text to show how many call events are. -->