Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 8bda463..9a1f9ee 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -632,9 +632,9 @@ public class OCFileListFragment extends ExtendedListFragment {
                 }
                 case R.id.action_copy:
                     Intent action = new Intent(getActivity(), FolderPickerActivity.class);
-
-                    // Pass mTargetFile that contains info of selected file/folder
-                    action.putExtra(FolderPickerActivity.EXTRA_FILE, mTargetFile);
+                    ArrayList files = new ArrayList();
+                    files.add(mTargetFile);
+                    action.putExtra(FolderPickerActivity.EXTRA_FILES, files);
                     getActivity().startActivityForResult(action, FileDisplayActivity.ACTION_COPY_FILES);
                     return true;
                 default: