- OCConnection+Upload: add proper handling for 409 status code

Author: felix-schwarz

ownCloudSDK/Connection/OCConnection+Upload.m

@@ -973,6 +973,13 @@ - (void)_handleDirectUploadFileResult:(OCHTTPRequest *)request error:(NSError *)
 						}
 						break;
 
+						case OCHTTPStatusCodeCONFLICT: {
+							NSString *errorDescription = nil;
+							errorDescription = [NSString stringWithFormat:OCLocalizedString(@"Another version of %@ already exists in %@.",nil), fileName, parentItem.name];
+							event.error = OCErrorWithDescription(OCErrorItemAlreadyExists, errorDescription);
+						}
+						break;
+
 						case OCHTTPStatusCodeINSUFFICIENT_STORAGE: {
 							NSString *errorDescription = nil;
 

ownCloudSDK/Resources/Localizable.xcstrings

@@ -2943,6 +2943,16 @@
         }
       }
     },
+    "Another version of %@ already exists in %@." : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Another version of %1$@ already exists in %2$@."
+          }
+        }
+      }
+    },
     "At least {{min}} {{characterType}}" : {
       "comment" : "Password Policy Check",
       "extractionState" : "manual",