From c468ba4df6a9e94051d3eaf647e5dff6b737aad5 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 20 Jun 2025 14:47:59 +0200 Subject: [PATCH] open chat when navigating back from thread Signed-off-by: Marcel Hibbe --- .../java/com/nextcloud/talk/chat/ChatActivity.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index f622e2060..e49c6fb44 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -393,9 +393,14 @@ class ChatActivity : private val onBackPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - val intent = Intent(this@ChatActivity, ConversationsListActivity::class.java) - intent.putExtras(Bundle()) - startActivity(intent) + if (isChatThread()) { + isEnabled = false + onBackPressedDispatcher.onBackPressed() + } else { + val intent = Intent(this@ChatActivity, ConversationsListActivity::class.java) + intent.putExtras(Bundle()) + startActivity(intent) + } } } @@ -2603,7 +2608,7 @@ class ChatActivity : viewThemeUtils.platform.colorTextView(title, ColorRole.ON_SURFACE) title.text = - if (threadId != null && threadId!! > 0) { + if (isChatThread()) { "Thread $threadId" } else if (currentConversation?.displayName != null) { try { @@ -4118,6 +4123,8 @@ class ChatActivity : } } + private fun isChatThread(): Boolean = threadId != null && threadId!! > 0 + fun openThread(roomToken: String, threadId: Long) { val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, roomToken)