Merge remote-tracking branch 'upstream/develop' into

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / MoveFileOperation.java

diff --git a/src/com/owncloud/android/operations/MoveFileOperation.java b/src/com/owncloud/android/operations/MoveFileOperation.java
index a4838ec..63856c3 100644 (file)
--- a/src/com/owncloud/android/operations/MoveFileOperation.java
+++ b/src/com/owncloud/android/operations/MoveFileOperation.java
@@ -80,6 +80,9 @@ public class MoveFileOperation extends SyncOperation {
         
         /// 2. remote move
         String targetPath = mTargetParentPath + mFile.getFileName();
         
         /// 2. remote move
         String targetPath = mTargetParentPath + mFile.getFileName();

+        if (mFile.isFolder()) {
+            targetPath += OCFile.PATH_SEPARATOR;
+        }

         MoveRemoteFileOperation operation = new MoveRemoteFileOperation(
                 mSrcPath, 
                 targetPath, 
         MoveRemoteFileOperation operation = new MoveRemoteFileOperation(
                 mSrcPath, 
                 targetPath, 


@@ -89,8 +92,7 @@ public class MoveFileOperation extends SyncOperation {
         
         /// 3. local move
         if (result.isSuccess()) {
         
         /// 3. local move
         if (result.isSuccess()) {

-            // TODO work in progress
-            //getStorageManager().moveLocalFile(mFile, targetPath);
+            getStorageManager().moveLocalFile(mFile, targetPath, mTargetParentPath);

         } 
         // TODO handle ResultCode.PARTIAL_MOVE_DONE in client Activity, for the moment
         
         } 
         // TODO handle ResultCode.PARTIAL_MOVE_DONE in client Activity, for the moment