Merge pull request #221 from nextcloud/newResultCode (281c7738) · Commits · e / os / Nextcloud Android Library

src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -72,8 +72,7 @@ import javax.net.ssl.SSLException;
	*/		*/
	public class RemoteOperationResult implements Serializable {		public class RemoteOperationResult implements Serializable {

	/** Generated - should be refreshed every time the class changes!! */;		// Generated - should be refreshed every time the class changes!!

	private static final long serialVersionUID = -1909603208238358633L;		private static final long serialVersionUID = -1909603208238358633L;
	private static final String TAG = RemoteOperationResult.class.getSimpleName();		private static final String TAG = RemoteOperationResult.class.getSimpleName();

	@@ -136,7 +135,8 @@ public class RemoteOperationResult implements Serializable {
	ETAG_CHANGED,		ETAG_CHANGED,
	ETAG_UNCHANGED,		ETAG_UNCHANGED,
	VIRUS_DETECTED,		VIRUS_DETECTED,
	FOLDER_ALREADY_EXISTS		FOLDER_ALREADY_EXISTS,
			CANNOT_CREATE_FILE
	}		}

	private boolean mSuccess = false;		private boolean mSuccess = false;
	@@ -503,7 +503,7 @@ public class RemoteOperationResult implements Serializable {
	previousCause = cause;		previousCause = cause;
	cause = cause.getCause();		cause = cause.getCause();
	}		}
	if (cause != null && cause instanceof CertificateCombinedException) {		if (cause instanceof CertificateCombinedException) {
	result = (CertificateCombinedException) cause;		result = (CertificateCombinedException) cause;
	}		}
	return result;		return result;