X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5480c0b52f6e81ab9d046a20743c563d75ef2dd1..24d67823860c34bccb1bd0ba6c127ba1bb5c6fd1:/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 a4838ecd..3a1103b1 100644 --- a/src/com/owncloud/android/operations/MoveFileOperation.java +++ b/src/com/owncloud/android/operations/MoveFileOperation.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2012-2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -29,8 +32,6 @@ import android.accounts.Account; /** * Operation mmoving an {@link OCFile} to a different folder. - * - * @author David A. Velasco */ public class MoveFileOperation extends SyncOperation { @@ -80,6 +81,9 @@ public class MoveFileOperation extends SyncOperation { /// 2. remote move String targetPath = mTargetParentPath + mFile.getFileName(); + if (mFile.isFolder()) { + targetPath += OCFile.PATH_SEPARATOR; + } MoveRemoteFileOperation operation = new MoveRemoteFileOperation( mSrcPath, targetPath, @@ -89,8 +93,7 @@ public class MoveFileOperation extends SyncOperation { /// 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