fix: back press of fda

Signed-off-by: alperozturk <[email protected]>

app/src/main/java/com/nextcloud/utils/extensions/DrawerActivityExtensions.kt

@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2024 Alper Ozturk <[email protected]>
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <[email protected]>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -10,22 +10,10 @@ package com.nextcloud.utils.extensions
 import android.content.Intent
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
-import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.activity.DrawerActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 
-@Suppress("ReturnCount")
-fun DrawerActivity.handleBackButtonEvent(currentDir: OCFile): Boolean {
-    if (DrawerActivity.menuItemId == R.id.nav_all_files && currentDir.isRootDirectory) {
-        moveTaskToBack(true)
-        return true
-    }
-
-    val isParentDirExists = (storageManager.getFileById(currentDir.parentId) != null)
-    if (isParentDirExists) {
-        return false
-    }
-
+fun DrawerActivity.navigateToAllFiles() {
     DrawerActivity.menuItemId = R.id.nav_all_files
     setNavigationViewItemChecked()
 
@@ -38,6 +26,4 @@ fun DrawerActivity.handleBackButtonEvent(currentDir: OCFile): Boolean {
     }.run {
         startActivity(this)
     }
-
-    return true
 }

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -83,6 +83,7 @@ import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.extensions.isActive
 import com.nextcloud.utils.extensions.lastFragment
 import com.nextcloud.utils.extensions.logFileSize
+import com.nextcloud.utils.extensions.navigateToAllFiles
 import com.nextcloud.utils.fileNameValidator.FileNameValidator.checkFolderPath
 import com.nextcloud.utils.view.FastScrollUtils
 import com.owncloud.android.MainApp
@@ -1137,43 +1138,55 @@ class FileDisplayActivity :
         }
     }
 
-    private val isRootDirectory: Boolean
-        get() {
-            val currentDir = getCurrentDir()
-            return (currentDir == null || currentDir.parentId == FileDataStorageManager.ROOT_PARENT_ID.toLong())
-        }
-
-    /*
-     * BackPressed priority/hierarchy:
-     *    1. close search view if opened
-     *    2. close drawer if opened
-     *    3. if it is OCFileListFragment and it's in Root -> (finish Activity) or it's not Root -> (browse up)
-     *    4. otherwise pop up the fragment and sortGroup view visibility and call onBackPressedDispatcher
+    /**
+     * Sets up a custom back-press handler for this activity.
+     *
+     * This callback determines how the back button behaves based on the current UI state:
+     * - If the search view is open, it closes it.
+     * - If the navigation drawer is open, it closes it.
+     * - If the left fragment is an [OCFileListFragment]:
+     *   - If in the root directory, it either navigates to "All Files" or finishes the activity.
+     *   - Otherwise, it navigates one level up.
+     * - Otherwise, it pops the current fragment from the back stack.
+     *
+     * ### About `isEnabled`
+     * `isEnabled` is a property of [OnBackPressedCallback].
+     * When `isEnabled = false`, this callback is **temporarily disabled**,
+     * allowing the system or other callbacks to handle the back press instead.
      */
     private fun handleBackPress() {
         onBackPressedDispatcher.addCallback(
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    if (isSearchOpen()) {
-                        resetSearchAction()
-                        return
-                    }
+                    when {
+                        isSearchOpen() -> {
+                            isEnabled = false
+                            resetSearchAction()
+                        }
 
-                    if (isDrawerOpen) {
-                        isEnabled = false
-                        onBackPressedDispatcher.onBackPressed()
-                        return
-                    }
+                        isDrawerOpen -> {
+                            isEnabled = false
+                            onBackPressedDispatcher.onBackPressed()
+                        }
 
-                    if ([email protected] is OCFileListFragment) {
-                        if (isRoot(getCurrentDir())) {
-                            finish()
-                        } else {
-                            browseUp(leftFragment as OCFileListFragment)
+                        leftFragment is OCFileListFragment -> {
+                            val fragment = leftFragment as OCFileListFragment
+                            if (isRoot(getCurrentDir())) {
+                                if (fragment.shouldNavigateBackToAllFiles()) {
+                                    navigateToAllFiles()
+                                } else {
+                                    finish()
+                                }
+                            } else {
+                                browseUp(fragment)
+                            }
+                        }
+
+                        else -> {
+                            isEnabled = false
+                            popBack()
                         }
-                    } else {
-                        popBack()
                     }
                 }
             }

app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt

@@ -25,7 +25,6 @@ import android.os.Handler
 import android.os.Looper
 import android.os.Parcelable
 import android.util.DisplayMetrics
-import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -57,15 +56,13 @@ import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.nextcloud.utils.extensions.getTypedActivity
-import com.nextcloud.utils.extensions.handleBackButtonEvent
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ListFragmentBinding
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.files.SearchRemoteOperation
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import com.owncloud.android.ui.EmptyRecyclerView
-import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.ui.activity.FolderPickerActivity
 import com.owncloud.android.ui.activity.OnEnforceableRefreshListener
@@ -767,19 +764,6 @@ open class ExtendedListFragment :
         }
     }
 
-    protected fun setupBackButtonRedirectToAllFiles() {
-        view?.isFocusableInTouchMode = true
-        view?.requestFocus()
-        view?.setOnKeyListener { _: View, keyCode: Int, event: KeyEvent ->
-            if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
-                val fda = getTypedActivity(FileActivity::class.java)
-                val currentDir = fda?.currentDir ?: return@setOnKeyListener false
-                return@setOnKeyListener fda.handleBackButtonEvent(currentDir)
-            }
-            false
-        }
-    }
-
     private data class EmptyListData(val headline: Int, val message: Int, val icon: Int?, val tintIcon: Boolean)
 
     companion object {

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java

@@ -234,12 +234,6 @@ public void onResume() {
         }
     }
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        setupBackButtonRedirectToAllFiles();
-    }
-
     @Override
     public void onMessageEvent(ChangeMenuEvent changeMenuEvent) {
         super.onMessageEvent(changeMenuEvent);

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -277,12 +277,6 @@ public void onResume() {
         super.onResume();
     }
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        setupBackButtonRedirectToAllFiles();
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -2325,4 +2319,15 @@ public boolean isEmpty() {
     public SearchEvent getSearchEvent() {
         return searchEvent;
     }
+
+    public boolean isSearchEventFavorite() {
+        if (searchEvent == null) {
+            return false;
+        }
+        return searchEvent.getSearchType() == SearchRemoteOperation.SearchType.FAVORITE_SEARCH;
+    }
+
+    public boolean shouldNavigateBackToAllFiles() {
+        return ((this instanceof GalleryFragment) || isSearchEventFavorite() || DrawerActivity.menuItemId == R.id.nav_favorites);
+    }
 }

gradle/verification-metadata.xml

@@ -17188,6 +17188,14 @@
             <sha256 value="f678808af32489394b4e0c41d9554087ee04151370aff34291a9343780d7a0e0" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="9b7c9434bf9002a63d5ac911b89b4abf014fabfd">
+         <artifact name="android-library-9b7c9434bf9002a63d5ac911b89b4abf014fabfd.aar">
+            <sha256 value="395f5ffec8a46cfca3158c1fee49ed6f643fe7eae759185b0e134765066772e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-9b7c9434bf9002a63d5ac911b89b4abf014fabfd.module">
+            <sha256 value="f8978720f1a573657d8571bfdbc60fd5976bc6911ea41dec422ef63ef8421b46" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="9e3c0046d242d8395855772d1105cb0b9fdd9f1f">
          <artifact name="android-library-9e3c0046d242d8395855772d1105cb0b9fdd9f1f.aar">
             <sha256 value="8f6337f2494d67ae9732c57850172588b9bf87f4f2ca4aa74e5f8f79f1192928" origin="Generated by Gradle" reason="Artifact is not signed"/>