Merge branch 'master' of https://github.com/owncloud/android into material_buttons

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

diff --git a/src/com/owncloud/android/operations/CopyFileOperation.java b/src/com/owncloud/android/operations/CopyFileOperation.java
index 6f0f908..77a9a07 100644 (file)
--- a/src/com/owncloud/android/operations/CopyFileOperation.java
+++ b/src/com/owncloud/android/operations/CopyFileOperation.java
@@ -18,7 +18,7 @@
 package com.owncloud.android.operations;
 
 import android.accounts.Account;
 package com.owncloud.android.operations;
 
 import android.accounts.Account;

-import android.util.Log;
+import android.content.Context;

 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.OwnCloudClient;


@@ -71,7 +71,7 @@ public class CopyFileOperation extends SyncOperation {
 
         /// 1. check copy validity
         if (mTargetParentPath.startsWith(mSrcPath)) {
 
         /// 1. check copy validity
         if (mTargetParentPath.startsWith(mSrcPath)) {

-            return new RemoteOperationResult(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
+            return new RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT);

         }
         mFile = getStorageManager().getFileByPath(mSrcPath);
         if (mFile == null) {
         }
         mFile = getStorageManager().getFileByPath(mSrcPath);
         if (mFile == null) {