Merge remote-tracking branch 'origin/sync_review_2'

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 71d2a48..cfee79d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -372,16 +372,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         \r
-        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && resultCode == RESULT_OK) {\r
-            requestSimpleUpload(data);\r
+        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestSimpleUpload(data, resultCode);\r
             \r
-        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && resultCode == RESULT_OK) {\r
-            requestMultipleUpload(data);\r
+        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestMultipleUpload(data, resultCode);\r
             \r
         }\r
     }\r
 \r
-    private void requestMultipleUpload(Intent data) {\r
+    private void requestMultipleUpload(Intent data, int resultCode) {\r
         String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
         if (filePaths != null) {\r
             String[] remotePaths = new String[filePaths.length];\r
@@ -400,6 +400,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);\r
             i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);\r
             i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);\r
+            if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+                i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
             startService(i);\r
             \r
         } else {\r
@@ -411,7 +413,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
-    private void requestSimpleUpload(Intent data) {\r
+    private void requestSimpleUpload(Intent data, int resultCode) {\r
         String filepath = null;\r
         try {\r
             Uri selectedImageUri = data.getData();\r
@@ -451,6 +453,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
         i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
         i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
+        if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+            i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r
         startService(i);\r
     }\r
 \r
@@ -684,6 +688,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     if (item == 0) {\r
                         //if (!mDualPane) { \r
                             Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
+                            action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));\r
                             startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
                         //} else {\r
                             // TODO create and handle new fragment LocalFileListFragment\r