From 899d79c9fd3115cb051a468a8075fe55f7f80b2d Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <swerss564@gmail.com>
Date: Thu, 12 Feb 2026 20:19:39 +0500
Subject: [PATCH] feat: enable onBackInvokedCallback in AndroidManifest and
 refine back handling in ChatsListScreen

---
 app/src/main/AndroidManifest.xml                         | 2 +-
 .../com/rosetta/messenger/ui/chats/ChatsListScreen.kt    | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b17ebb..41a220b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <application
         android:name=".RosettaApplication"
         android:allowBackup="true"
-        android:enableOnBackInvokedCallback="false"
+        android:enableOnBackInvokedCallback="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
index beb5c8a..b5f465c 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
@@ -288,16 +288,13 @@ fun ChatsListScreen(
         val mutedChats by preferencesManager.mutedChatsForAccount(accountPublicKey)
                 .collectAsState(initial = emptySet())
 
-        val activity = context as? android.app.Activity
-
-        // Всегда перехватываем back чтобы predictive back анимация не ломала UI
-        BackHandler(enabled = true) {
+        // Back: drawer → закрыть, selection → сбросить
+        // Когда ничего не открыто — НЕ перехватываем, система сама закроет приложение корректно
+        BackHandler(enabled = isSelectionMode || drawerState.isOpen) {
                 if (isSelectionMode) {
                         selectedChatKeys = emptySet()
                 } else if (drawerState.isOpen) {
                         scope.launch { drawerState.close() }
-                } else {
-                        activity?.moveTaskToBack(true)
                 }
         }