From 2cdffb9630bd9dcddcca160144c22ae2b904b08e Mon Sep 17 00:00:00 2001
From: Werner Rabl <w.rabl@opencloud.eu>
Date: Thu, 10 Sep 2026 12:42:57 +0200
Subject: [PATCH] fix: back button moves up a folder instead of closing app

---
 .../files/filelist/MainFileListFragment.kt    | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt b/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt
index 21acbf63b..6d5373fab 100644
--- a/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt
+++ b/opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -43,6 +43,7 @@ import android.view.WindowManager
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
@@ -73,6 +74,7 @@ import eu.opencloud.android.domain.exceptions.TooEarlyException
 import eu.opencloud.android.domain.files.model.FileListOption
 import eu.opencloud.android.domain.files.model.FileMenuOption
 import eu.opencloud.android.domain.files.model.OCFile
+import eu.opencloud.android.domain.files.model.OCFile.Companion.ROOT_PARENT_ID
 import eu.opencloud.android.domain.files.model.OCFile.Companion.ROOT_PATH
 import eu.opencloud.android.domain.files.model.OCFileSyncInfo
 import eu.opencloud.android.domain.files.model.OCFileWithSyncInfo
@@ -182,6 +184,17 @@ class MainFileListFragment : Fragment(),
 
     private var isMultiPersonal = false
 
+    private val onBackPressedCallback = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            if (isFabExpanded()) {
+                collapseFab()
+                setFabMainContentDescription()
+            } else {
+                onBrowseUp()
+            }
+        }
+    }
+
     private var menu: Menu? = null
     private var checkedFiles: List<OCFile> = emptyList()
     private var filesToRemove: List<OCFile> = emptyList()
@@ -328,6 +341,8 @@ class MainFileListFragment : Fragment(),
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         isMultiPersonal = capabilityViewModel.checkMultiPersonal()
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, onBackPressedCallback)
+        updateBackPressedCallbackState()
         initViews()
         subscribeToViewModels()
     }
@@ -497,8 +512,15 @@ class MainFileListFragment : Fragment(),
 
     }
 
+    private fun updateBackPressedCallbackState() {
+        val parentId = mainFileListViewModel.currentFolderDisplayed.value.parentId
+        val isInSubfolder = parentId != null && parentId != ROOT_PARENT_ID
+        onBackPressedCallback.isEnabled = isFabExpanded() || isInSubfolder
+    }
+
     private fun observeCurrentFolderDisplayed() {
         collectLatestLifecycleFlow(mainFileListViewModel.currentFolderDisplayed) { currentFolderDisplayed: OCFile ->
+            updateBackPressedCallbackState()
             fileActions?.onCurrentFolderUpdated(currentFolderDisplayed, mainFileListViewModel.getSpace())
             val fileListOption = mainFileListViewModel.fileListOption.value
             val refreshFolderNeeded = fileListOption.isAllFiles() ||
@@ -1057,6 +1079,7 @@ class MainFileListFragment : Fragment(),
                 fabMkdir.isFocusable = isFabExpanded()
                 fabNewfile.isFocusable = isFabExpanded()
                 fabNewshortcut.isFocusable = isFabExpanded()
+                updateBackPressedCallbackState()
                 if (fabMain.isExpanded) {
                     binding.fabMain.findViewById<AddFloatingActionButton>(com.getbase.floatingactionbutton.R.id.fab_expand_menu_button)
                         .contentDescription = getString(R.string.content_description_add_new_content_expanded)
@@ -1128,7 +1151,7 @@ class MainFileListFragment : Fragment(),
             fabNewfile.isFocusable = false
             fabNewshortcut.isFocusable = false
         }
-
+        updateBackPressedCallbackState()
     }
 
     fun isFabExpanded() = binding.fabMain.isExpanded