flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Added INVALID_COPY_INTO_DESCENDANT code

Browse Source
This commit is contained in:
Jorge Antonio Diaz-Benito Soriano 2014-10-28 12:46:44 +01:00 committed by David A. Velasco
parent 542e596bf5
commit f753b1bde8
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
View File

@ -47,14 +47,6 @@ import org.apache.commons.httpclient.HttpStatus;
import org.apache.jackrabbit.webdav.DavException;
import org.json.JSONException;
import java.io.IOException;
import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import javax.net.ssl.SSLException;
@ -69,7 +61,7 @@ import javax.net.ssl.SSLException;
public class RemoteOperationResult implements Serializable {
/** Generated - should be refreshed every time the class changes!! */;
private static final long serialVersionUID = -1909603208238358633L;
private static final long serialVersionUID = 1129130415603799707L;
private static final String TAG = RemoteOperationResult.class.getSimpleName();
@ -112,6 +104,7 @@ public class RemoteOperationResult implements Serializable {
SHARE_FORBIDDEN,
OK_REDIRECT_TO_NON_SECURE_CONNECTION,
INVALID_MOVE_INTO_DESCENDANT,
INVALID_COPY_INTO_DESCENDANT,
PARTIAL_MOVE_DONE,
PARTIAL_COPY_DONE,
INVALID_CHARACTER_DETECT_IN_SERVER

2
src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java
View File

@ -104,7 +104,7 @@ public class CopyRemoteFileOperation extends RemoteOperation {
}
if (mTargetRemotePath.startsWith(mSrcRemotePath)) {
return new RemoteOperationResult(ResultCode.INVALID_MOVE_INTO_DESCENDANT);
return new RemoteOperationResult(ResultCode.INVALID_COPY_INTO_DESCENDANT);
}