From 5b8c894512cbbda83599231c32b3595754b4547b Mon Sep 17 00:00:00 2001 From: jeffrey-signal Date: Fri, 8 May 2026 11:50:18 -0400 Subject: [PATCH] Fix navigation from conversation settings to search and groups in common screens. --- .../settings/conversation/ConversationSettingsFragment.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt index 94cf60f51e..43cfa702f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt @@ -542,7 +542,9 @@ class ConversationSettingsFragment : .build() startActivity(intent) - requireActivity().finish() + if (requireActivity() !is MainNavigationChatDetailRouter) { + requireActivity().finish() + } } } ) @@ -812,7 +814,9 @@ class ConversationSettingsFragment : recipient = group, onRowClick = { CommunicationActions.startConversation(requireActivity(), group, null) - requireActivity().finish() + if (requireActivity() !is MainNavigationChatDetailRouter) { + requireActivity().finish() + } } ) )