瀏覽代碼

Map SSL specific errors to UploadResult.NETWORK_CONNECTION error too

David A. Velasco 9 年之前
父節點
當前提交
babf24c2ee

+ 9 - 5
src/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -523,12 +523,16 @@ public class UploadsStorageManager extends Observable {
                 // TODO: Disable for testing of menu actions in uploads view
                 if (shouldRetryFailedUpload(uploadResult)) {
                     updateUploadStatus(
-                            upload.getOCUploadId(), UploadStatus.UPLOAD_FAILED,
-                            UploadResult.fromOperationResult(uploadResult), upload.getRemotePath());
+                        upload.getOCUploadId(),
+                        UploadStatus.UPLOAD_FAILED,
+                        UploadResult.fromOperationResult(uploadResult),
+                        upload.getRemotePath());
                 } else {
-                    updateUploadStatus(upload.getOCUploadId(),
-                            UploadsStorageManager.UploadStatus.UPLOAD_FAILED,
-                            UploadResult.fromOperationResult(uploadResult), upload.getRemotePath());
+                    updateUploadStatus(
+                        upload.getOCUploadId(),
+                        UploadStatus.UPLOAD_FAILED,
+                        UploadResult.fromOperationResult(uploadResult),
+                        upload.getRemotePath());
                 }
             }
         }

+ 6 - 1
src/com/owncloud/android/db/UploadResult.java

@@ -81,6 +81,9 @@ public enum UploadResult {
             case HOST_NOT_AVAILABLE:
             case TIMEOUT:
             case WRONG_CONNECTION:
+            case INCORRECT_ADDRESS:
+            case SSL_ERROR:
+            case SSL_RECOVERABLE_PEER_UNVERIFIED:
                 return NETWORK_CONNECTION;
             case ACCOUNT_EXCEPTION:
             case UNAUTHORIZED:
@@ -100,11 +103,13 @@ public enum UploadResult {
             case DELAYED_FOR_WIFI:
                 return DELAYED_FOR_WIFI;
             case UNKNOWN_ERROR:
-                if (result.getException() instanceof java.io.FileNotFoundException)
+                if (result.getException() instanceof java.io.FileNotFoundException) {
                     return FILE_ERROR;
+                }
                 return UNKNOWN;
             default:
                 return UNKNOWN;
         }
+
     }
 }