X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/53b67429ea8c97b83602cec3446a10e0b6b7ff5e..9aab2d26da38f26e7ff03a0b5db3bd01b51bce05:/src/com/owncloud/android/operations/RemoteOperationResult.java?ds=inline diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java index 080e0b64..d8fbe460 100644 --- a/src/com/owncloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -19,6 +19,7 @@ package com.owncloud.android.operations; import java.io.IOException; +import java.io.Serializable; import java.net.MalformedURLException; import java.net.SocketException; import java.net.SocketTimeoutException; @@ -29,8 +30,7 @@ import javax.net.ssl.SSLException; import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; - -import android.util.Log; +import org.apache.jackrabbit.webdav.DavException; import com.owncloud.android.network.CertificateCombinedException; @@ -38,17 +38,22 @@ import com.owncloud.android.network.CertificateCombinedException; /** * The result of a remote operation required to an ownCloud server. * - * Provides a common classification of resulst for all the application. + * Provides a common classification of remote operation results for all the application. * * @author David A. Velasco */ -public class RemoteOperationResult { +public class RemoteOperationResult implements Serializable { + + /** Generated - to refresh every time the class changes */ + private static final long serialVersionUID = -7805531062432602444L; + public enum ResultCode { OK, OK_SSL, OK_NO_SSL, UNHANDLED_HTTP_CODE, + UNAUTHORIZED, FILE_NOT_FOUND, INSTANCE_NOT_CONFIGURED, UNKNOWN_ERROR, @@ -58,15 +63,20 @@ public class RemoteOperationResult { HOST_NOT_AVAILABLE, NO_NETWORK_CONNECTION, SSL_ERROR, - BAD_OC_VERSION, + SSL_RECOVERABLE_PEER_UNVERIFIED, + BAD_OC_VERSION, + STORAGE_ERROR_MOVING_FROM_TMP, + CANCELLED, + INVALID_LOCAL_FILE_NAME, + INVALID_OVERWRITE, + CONFLICT } - private static final String TAG = null; - private boolean mSuccess = false; private int mHttpCode = -1; private Exception mException = null; private ResultCode mCode = ResultCode.UNKNOWN_ERROR; + private Object mExtraData = null; public RemoteOperationResult(ResultCode code) { mCode = code; @@ -82,12 +92,18 @@ public class RemoteOperationResult { } else if (httpCode > 0) { switch (httpCode) { + case HttpStatus.SC_UNAUTHORIZED: + mCode = ResultCode.UNAUTHORIZED; + break; case HttpStatus.SC_NOT_FOUND: mCode = ResultCode.FILE_NOT_FOUND; break; case HttpStatus.SC_INTERNAL_SERVER_ERROR: mCode = ResultCode.INSTANCE_NOT_CONFIGURED; break; + case HttpStatus.SC_CONFLICT: + mCode = ResultCode.CONFLICT; + break; default: mCode = ResultCode.UNHANDLED_HTTP_CODE; } @@ -97,7 +113,10 @@ public class RemoteOperationResult { public RemoteOperationResult(Exception e) { mException = e; - if (e instanceof SocketException) { + if (e instanceof OperationCancelledException) { + mCode = ResultCode.CANCELLED; + + } else if (e instanceof SocketException) { mCode = ResultCode.WRONG_CONNECTION; } else if (e instanceof SocketTimeoutException) { @@ -112,8 +131,17 @@ public class RemoteOperationResult { } else if (e instanceof UnknownHostException) { mCode = ResultCode.HOST_NOT_AVAILABLE; - } else if (e instanceof SSLException) { - mCode = ResultCode.SSL_ERROR; + } else if (e instanceof SSLException || e instanceof RuntimeException) { + CertificateCombinedException se = getCertificateCombinedException(e); + if (se != null) { + mException = se; + if (se.isRecoverable()) { + mCode = ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED; + } + + } else { + mCode = ResultCode.SSL_ERROR; + } } else { mCode = ResultCode.UNKNOWN_ERROR; @@ -126,6 +154,10 @@ public class RemoteOperationResult { return mSuccess; } + public boolean isCancelled() { + return mCode == ResultCode.CANCELLED; + } + public int getHttpCode() { return mHttpCode; } @@ -139,34 +171,42 @@ public class RemoteOperationResult { } public boolean isSslRecoverableException() { - return (getSslRecoverableException() != null); + return mCode == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED; } - public CertificateCombinedException getSslRecoverableException() { + public void setExtraData(Object data) { + mExtraData = data; + } + + public Object getExtraData() { + return mExtraData; + } + + private CertificateCombinedException getCertificateCombinedException(Exception e) { CertificateCombinedException result = null; - if (mCode == ResultCode.SSL_ERROR) { - if (mException instanceof CertificateCombinedException) - result = (CertificateCombinedException)mException; - Throwable cause = mException.getCause(); - Throwable previousCause = null; - while (cause != null && cause != previousCause && !(cause instanceof CertificateCombinedException)) { - previousCause = cause; - cause = cause.getCause(); - } - if (cause != null && cause instanceof CertificateCombinedException) - result = (CertificateCombinedException)cause; + if (e instanceof CertificateCombinedException) { + return (CertificateCombinedException)e; + } + Throwable cause = mException.getCause(); + Throwable previousCause = null; + while (cause != null && cause != previousCause && !(cause instanceof CertificateCombinedException)) { + previousCause = cause; + cause = cause.getCause(); } - if (result != null && result.isRecoverable()) - return result; - else - return null; + if (cause != null && cause instanceof CertificateCombinedException) { + result = (CertificateCombinedException)cause; + } + return result; } public String getLogMessage() { if (mException != null) { - if (mException instanceof SocketException) { + if (mException instanceof OperationCancelledException) { + return "Operation cancelled by the caller"; + + } else if (mException instanceof SocketException) { return "Socket exception"; } else if (mException instanceof SocketTimeoutException) { @@ -181,9 +221,18 @@ public class RemoteOperationResult { } else if (mException instanceof UnknownHostException) { return "Unknown host exception"; + } else if (mException instanceof CertificateCombinedException) { + if (((CertificateCombinedException) mException).isRecoverable()) + return "SSL recoverable exception"; + else + return "SSL exception"; + } else if (mException instanceof SSLException) { return "SSL exception"; + } else if (mException instanceof DavException) { + return "Unexpected WebDAV exception"; + } else if (mException instanceof HttpException) { return "HTTP violation"; @@ -195,8 +244,21 @@ public class RemoteOperationResult { } } + if (mCode == ResultCode.INSTANCE_NOT_CONFIGURED) { + return "The ownCloud server is not configured!"; + + } else if (mCode == ResultCode.NO_NETWORK_CONNECTION) { + return "No network connection"; + + } else if (mCode == ResultCode.BAD_OC_VERSION) { + return "No valid ownCloud version was found at the server"; + + } else if (mCode == ResultCode.STORAGE_ERROR_MOVING_FROM_TMP) { + return "Error while moving file from temporal to final directory"; + } + return "Operation finished with HTTP status code " + mHttpCode + " (" + (isSuccess()?"success":"fail") + ")"; - + } }