Move or Copy files: Start in the parent folder instead of root

Previous behavior always moved up to the root folder, which meant the user
lost the context of their current files. Especially in complicated nested
folder structures, this made standard operations overly complicated, like
duplicating in the same folder or duplicating/moving to a sibling folder.

This is now also in sync with the behavior of the iOS app and the web UI

Signed-off-by: Philipp Hasper <[email protected]>

Author: PhilLab

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

@@ -25,6 +25,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.nextcloud.client.account.User
 import com.nextcloud.client.di.Injectable
+import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FilesFolderPickerBinding
@@ -275,8 +276,13 @@ open class FolderPickerActivity :
         super.onResume()
         Log_OC.e(TAG, "onResume() start")
 
-        refreshListOfFilesFragment(false)
-        file = listOfFilesFragment?.currentFile
+        val extraFolder = intent.getParcelableArgument(EXTRA_FOLDER.toString(), OCFile::class.java)
+        if (extraFolder != null) {
+            file = extraFolder
+        } else {
+            file = listOfFilesFragment?.currentFile
+        }
+        refreshListOfFilesFragment(file, false)
         updateUiElements()
 
         val intentFilter = getSyncIntentFilter()
@@ -351,8 +357,8 @@ open class FolderPickerActivity :
             }
         }
 
-    private fun refreshListOfFilesFragment(fromSearch: Boolean) {
-        listOfFilesFragment?.listDirectory(false, fromSearch)
+    private fun refreshListOfFilesFragment(directory: OCFile, fromSearch: Boolean) {
+        listOfFilesFragment?.listDirectory(directory, false, fromSearch)
     }
 
     fun browseToRoot() {

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

@@ -1437,6 +1437,8 @@ private void pickFolderForMoveOrCopy(final Set<OCFile> checkedFiles) {
             paths.add(file.getRemotePath());
         }
         action.putStringArrayListExtra(FolderPickerActivity.EXTRA_FILE_PATHS, paths);
+        action.putExtra(FolderPickerActivity.EXTRA_FOLDER, getCurrentFile());
+        action.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); // No animation since we stay in the same folder
         action.putExtra(FolderPickerActivity.EXTRA_ACTION, extraAction);
         getActivity().startActivityForResult(action, requestCode);
     }