Merge pull request #15301 from nextcloud/backport/15127/stable-3.32

[stable-3.32] Redirect to All Files from FileDisplayActivity's Fragments

Author: alperozturk96

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

@@ -7,9 +7,12 @@
 
 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
 
 /**
  * Determines the appropriate menu item ID based on the current ActionBar title.
@@ -50,3 +53,31 @@ fun DrawerActivity.getMenuItemIdFromTitle(): Int? {
         }
     }
 }
+
+@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
+    }
+
+    DrawerActivity.menuItemId = R.id.nav_all_files
+    setNavigationViewItemChecked()
+
+    MainApp.showOnlyFilesOnDevice(false)
+    MainApp.showOnlyPersonalFiles(false)
+
+    Intent(applicationContext, FileDisplayActivity::class.java).apply {
+        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        action = FileDisplayActivity.ALL_FILES
+    }.run {
+        startActivity(this)
+    }
+
+    return true
+}

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

@@ -24,6 +24,7 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.DisplayMetrics
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -59,6 +60,7 @@ import com.nextcloud.client.network.ConnectivityService.GenericCallback
 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
@@ -730,6 +732,18 @@ open class ExtendedListFragment :
         }
     }
 
+    protected fun setupBackButtonRedirectToAllFiles() {
+        view?.isFocusableInTouchMode = true
+        view?.requestFocus()
+        view?.setOnKeyListener { _: View, keyCode: Int, event: KeyEvent ->
+            val fda = getTypedActivity(FileActivity::class.java)
+            if (fda != null && (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK)) {
+                return@setOnKeyListener fda.handleBackButtonEvent(fda.currentDir)
+            }
+            false
+        }
+    }
+
     companion object {
         protected val TAG: String = ExtendedListFragment::class.java.getSimpleName()
 

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

@@ -236,6 +236,12 @@ 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

@@ -284,6 +284,12 @@ public void onResume() {
         super.onResume();
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        setupBackButtonRedirectToAllFiles();
+    }
+
     /**
      * {@inheritDoc}
      */

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

@@ -289,8 +289,8 @@ class BackupFragment : FileFragment(), OnDateSetListener, Injectable {
      * Refreshes the folder and returns updated backup files
      */
     @Suppress("TooGenericExceptionCaught")
-    private suspend fun fetchBackupFiles(folder: OCFile, storageManager: FileDataStorageManager): List<OCFile> {
-        return withContext(Dispatchers.IO) {
+    private suspend fun fetchBackupFiles(folder: OCFile, storageManager: FileDataStorageManager): List<OCFile> =
+        withContext(Dispatchers.IO) {
             try {
                 val operation = RefreshFolderOperation(
                     folder,
@@ -317,7 +317,6 @@ class BackupFragment : FileFragment(), OnDateSetListener, Injectable {
                 listOf()
             }
         }
-    }
 
     @Deprecated("Deprecated in Java")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {