Refactored remove file operation (inherits RemoteOperation, so generates RemoteOperat...

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

diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java
index 0618b86..60b2b1a 100644 (file)
--- 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;
 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;
 import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;


@@ -29,6 +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 org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;

+import org.apache.jackrabbit.webdav.DavException;

 
 import com.owncloud.android.network.CertificateCombinedException;
 
 
 import com.owncloud.android.network.CertificateCombinedException;
 


@@ -40,13 +42,18 @@ import com.owncloud.android.network.CertificateCombinedException;
  * 
  * @author David A. Velasco
  */
  * 
  * @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,
     
     public enum ResultCode { 
         OK,
         OK_SSL,
         OK_NO_SSL,
         UNHANDLED_HTTP_CODE,

+        UNAUTHORIZED,        

         FILE_NOT_FOUND, 
         INSTANCE_NOT_CONFIGURED, 
         UNKNOWN_ERROR, 
         FILE_NOT_FOUND, 
         INSTANCE_NOT_CONFIGURED, 
         UNKNOWN_ERROR, 


@@ -81,6 +88,9 @@ public class RemoteOperationResult {
             
         } else if (httpCode > 0) {
             switch (httpCode) {
             
         } 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_NOT_FOUND:
                     mCode = ResultCode.FILE_NOT_FOUND;
                     break;


@@ -196,11 +206,17 @@ public class RemoteOperationResult {
             } else if (mException instanceof UnknownHostException) {
                 return "Unknown host exception";
         
             } else if (mException instanceof UnknownHostException) {
                 return "Unknown host exception";
         

-            } else if (mException instanceof SSLException) {
-                if (mCode == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)
+            } else if (mException instanceof CertificateCombinedException) {
+                if (((CertificateCombinedException) mException).isRecoverable())

                     return "SSL recoverable exception";
                 else
                     return "SSL exception";
                     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";
 
             } else if (mException instanceof HttpException) {
                 return "HTTP violation";


@@ -227,7 +243,7 @@ public class RemoteOperationResult {
         }
         
         return "Operation finished with HTTP status code " + mHttpCode + " (" + (isSuccess()?"success":"fail") + ")";
         }
         
         return "Operation finished with HTTP status code " + mHttpCode + " (" + (isSuccess()?"success":"fail") + ")";

-
+        

     }
 
 }
     }
 
 }