fix back button press

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt

@@ -18,6 +18,8 @@ import com.nextcloud.utils.extensions.getParcelableArgument
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityNavigatorBinding
 import com.owncloud.android.ui.activity.DrawerActivity
+import com.owncloud.android.ui.navigation.`interface`.NavigatorOnBackPressListener
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import dagger.android.support.AndroidSupportInjection
 
 class NavigatorActivity : DrawerActivity() {
@@ -50,21 +52,36 @@ class NavigatorActivity : DrawerActivity() {
         super.onAttachFragment(fragment)
     }
 
+    /**
+     * Handles action bar leading button action
+     */
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            val currentScreen = navigator.getTopScreen()
+            val onBackPressListener =
+                supportFragmentManager.fragments
+                    .filterIsInstance<NavigatorOnBackPressListener>()
+                    .firstOrNull()
 
-            if (currentScreen?.hasDrawer == false) {
-                onBackPressedDispatcher.onBackPressed()
+            if (onBackPressListener != null && onBackPressListener.canInterceptBackPress()) {
+                onBackPressListener.interceptBackPress()
             } else {
-                if (isDrawerOpen) {
-                    closeDrawer()
+                val currentScreen = navigator.getTopScreen()
+
+                if (currentScreen?.hasDrawer == false) {
+                    onBackPressedDispatcher.onBackPressed()
                 } else {
-                    openDrawer()
+                    if (isDrawerOpen) {
+                        closeDrawer()
+                    } else {
+                        openDrawer()
+                    }
                 }
             }
+
             return true
         }
+
+
         return super.onOptionsItemSelected(item)
     }
 

app/src/main/java/com/owncloud/android/ui/navigation/NavigatorScreen.kt

@@ -13,6 +13,7 @@ import com.owncloud.android.R
 import com.owncloud.android.ui.fragment.ActivitiesFragment
 import com.owncloud.android.ui.fragment.community.CommunityFragment
 import com.owncloud.android.ui.fragment.notifications.NotificationsFragment
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import com.owncloud.android.ui.trashbin.TrashbinFragment
 import kotlinx.parcelize.Parcelize
 

app/src/main/java/com/owncloud/android/ui/navigation/interface/NavigatorOnBackPressListener.kt

@@ -0,0 +1,13 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.owncloud.android.ui.navigation.`interface`
+
+interface NavigatorOnBackPressListener {
+    fun canInterceptBackPress(): Boolean
+    fun interceptBackPress()
+}

…/android/ui/navigation/ActionBarStyle.kt …id/ui/navigation/model/ActionBarStyle.ktapp/src/main/java/com/owncloud/android/ui/navigation/ActionBarStyle.kt renamed to app/src/main/java/com/owncloud/android/ui/navigation/model/ActionBarStyle.kt app/src/main/java/com/owncloud/android/ui/navigation/ActionBarStyle.kt renamed to app/src/main/java/com/owncloud/android/ui/navigation/model/ActionBarStyle.kt

@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-package com.owncloud.android.ui.navigation
+package com.owncloud.android.ui.navigation.model
 
 enum class ActionBarStyle {
     Plain,

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinFragment.kt

@@ -21,7 +21,6 @@ import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.PopupMenu
 import android.widget.TextView
-import androidx.activity.OnBackPressedCallback
 import androidx.annotation.IdRes
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
@@ -51,6 +50,7 @@ import com.owncloud.android.ui.adapter.TrashbinListAdapter
 import com.owncloud.android.ui.dialog.SortingOrderDialogFragment.OnSortingOrderListener
 import com.owncloud.android.ui.interfaces.TrashbinActivityInterface
 import com.owncloud.android.ui.navigation.NavigatorActivity
+import com.owncloud.android.ui.navigation.`interface`.NavigatorOnBackPressListener
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.FileSortOrder
 import com.owncloud.android.utils.theme.ViewThemeUtils
@@ -61,6 +61,7 @@ class TrashbinFragment :
     TrashbinActivityInterface,
     OnSortingOrderListener,
     TrashbinContract.View,
+    NavigatorOnBackPressListener,
     Injectable {
 
     @Inject
@@ -98,12 +99,6 @@ class TrashbinFragment :
 
     private var multiChoiceModeListener: MultiChoiceModeListener? = null
 
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            trashbinPresenter?.navigateUp()
-        }
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FragmentTrashbinBinding.inflate(inflater, container, false)
         val binding = binding!!
@@ -131,7 +126,6 @@ class TrashbinFragment :
 
         val trashRepository = RemoteTrashbinRepository(accountProvider.user, clientFactory)
         trashbinPresenter = TrashbinPresenter(trashRepository, this)
-        handleBackPress()
         active = true
         setupContent()
         addMenuProvider()
@@ -208,13 +202,6 @@ class TrashbinFragment :
         }
     }
 
-    private fun handleBackPress() {
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            onBackPressedCallback
-        )
-    }
-
     fun loadFolder(onComplete: () -> Unit = {}, onError: () -> Unit = {}) {
         // exit action mode on data refresh
         multiChoiceModeListener?.exitSelectionMode()
@@ -323,7 +310,6 @@ class TrashbinFragment :
     override fun atRoot(isRoot: Boolean) {
         val navigatorActivity = getTypedActivity(NavigatorActivity::class.java)
         navigatorActivity?.setDrawerIndicatorEnabled(isRoot)
-        onBackPressedCallback.isEnabled = !isRoot
     }
 
     override fun onSortingOrderChosen(selection: FileSortOrder?) {
@@ -495,6 +481,12 @@ class TrashbinFragment :
         }
     }
 
+    override fun canInterceptBackPress(): Boolean = (trashbinPresenter?.isRoot == false)
+
+    override fun interceptBackPress() {
+        trashbinPresenter?.navigateUp()
+    }
+
     companion object {
         const val EMPTY_LIST_COUNT = 1
     }