From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 18 Nov 2015 16:06:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/multiSelect' into beta
X-Git-Tag: beta-20151122~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/de9c090e5275fe69cb39104d82bbdc57c0363261?hp=87db47a9004f1fe55032793069b498c6c5dc2e93

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 8bda4634..9a1f9eef 100644
--- 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: