From 5f67c9363e2bf64b28773e4c4642e4dba4bf9701 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 15 Jun 2026 16:18:52 -0300
Subject: [PATCH] Fix back navigation when opening group settings from the chat
 list.

---
 app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt | 1 +
 .../settings/conversation/ConversationSettingsNavigator.kt   | 2 +-
 .../securesms/main/MainNavigationDetailLocation.kt           | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index 3fe826f071..f800655f0a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -561,6 +561,7 @@ class MainActivity :
 
         val scope = rememberCoroutineScope()
         BackHandler(paneExpansionState.currentAnchor == detailOnlyAnchor) {
+          mainNavigationViewModel.goTo(MainNavigationDetailLocation.Empty)
           scope.launch {
             paneExpansionState.animateTo(listOnlyAnchor)
           }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsNavigator.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsNavigator.kt
index 9b4c1f04e8..b454bcfcc0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsNavigator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsNavigator.kt
@@ -20,7 +20,7 @@ object ConversationSettingsNavigator {
     recipient: Recipient
   ) {
     if (activity is MainNavigationChatDetailRouter) {
-      activity.goToChatDetail(MainNavigationDetailLocation.Chats.ConversationSettings(recipient.id))
+      activity.goToChatDetail(MainNavigationDetailLocation.Chats.ConversationSettings(recipient.id, isContentRoot = true))
       return
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationDetailLocation.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationDetailLocation.kt
index 0f83dcb956..887c4182ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationDetailLocation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainNavigationDetailLocation.kt
@@ -90,7 +90,10 @@ sealed interface MainNavigationDetailLocation : Parcelable {
     }
 
     @Serializable
-    data class ConversationSettings(val recipientId: RecipientId) : Chats {
+    data class ConversationSettings(
+      val recipientId: RecipientId,
+      override val isContentRoot: Boolean = false
+    ) : Chats {
       @Transient
       @IgnoredOnParcel
       override val controllerKey: RecipientId = recipientId