flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-19 20:32:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into forbidden_characters_from_server

Browse Source 
Conflicts:
	src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
	src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
This commit is contained in:
masensio
2015-06-15 14:41:27 +02:00
parent 4ca0ff2203 639cb7eacd
commit 060ca75f17
7 changed files with 212 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java
+11 -2
View File
@@ -62,11 +62,11 @@ import com.owncloud.android.lib.common.utils.Log_OC;
public class RemoteOperationResult implements Serializable {
/** Generated - should be refreshed every time the class changes!! */;
private static final long serialVersionUID = -4184015692120731701L;
private static final long serialVersionUID = -1909603208238358633L;
private static final String TAG = RemoteOperationResult.class.getSimpleName();
public enum ResultCode {
public enum ResultCode {
OK,
OK_SSL,
OK_NO_SSL,
@@ -115,6 +115,7 @@ public class RemoteOperationResult implements Serializable {
private ResultCode mCode = ResultCode.UNKNOWN_ERROR;
private String mRedirectedLocation;
private String mAuthenticate;
private String mLastPermanentLocation = null;
private ArrayList<Object> mData;
@@ -433,4 +434,12 @@ public class RemoteOperationResult implements Serializable {
return mAuthenticate;
}
public String getLastPermanentLocation() {
return mLastPermanentLocation;
}
public void setLastPermanentLocation(String lastPermanentLocation) {
mLastPermanentLocation = lastPermanentLocation;
}
}