Merge remote-tracking branch 'upstream/develop' into us4_view_text_files

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java

diff --cc src/com/owncloud/android/datamodel/OCFile.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 20507ea,762cb99..0fa678d
--- 1/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
--- 2/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@@ -621,19 -615,18 +621,18 @@@ public class FileDisplayActivity extend
          } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
              requestMultipleUpload(data, resultCode);
  
-         } else if (requestCode == ACTION_MOVE_FILES && (resultCode == RESULT_OK ||
-                 resultCode == MoveActivity.RESULT_OK_AND_MOVE)) {
 -        } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK){
++        } else if (requestCode == ACTION_MOVE_FILES && resultCode == RESULT_OK) {
  
              final Intent fData = data;
 -            final int fResultCode = resultCode; 
 +            final int fResultCode = resultCode;
              getHandler().postDelayed(
 -                new Runnable() {
 -                    @Override
 -                    public void run() {
 -                        requestMoveOperation(fData, fResultCode);
 -                    }
 -                }, 
 -                DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
 +                    new Runnable() {
 +                        @Override
 +                        public void run() {
 +                            requestMoveOperation(fData, fResultCode);
 +                        }
 +                    },
 +                    DELAY_TO_REQUEST_OPERATION_ON_ACTIVITY_RESULTS
              );
          }
      }
@@@ -745,13 -738,13 +744,13 @@@
  
      /**
       * Request the operation for moving the file/folder from one path to another
 -     * 
 -     * @param data              Intent received
 -     * @param resultCode        Result code received
 +     *
 +     * @param data       Intent received
 +     * @param resultCode Result code received
       */
      private void requestMoveOperation(Intent data, int resultCode) {
-         OCFile folderToMoveAt = (OCFile) data.getParcelableExtra(MoveActivity.EXTRA_CURRENT_FOLDER);
-         OCFile targetFile = (OCFile) data.getParcelableExtra(MoveActivity.EXTRA_TARGET_FILE);
+         OCFile folderToMoveAt = (OCFile) data.getParcelableExtra(FolderPickerActivity.EXTRA_FOLDER);
+         OCFile targetFile = (OCFile) data.getParcelableExtra(FolderPickerActivity.EXTRA_FILE);
          getFileOperationsHelper().moveFile(folderToMoveAt, targetFile);
      }
  

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge