From: masensio <masensio@solidgear.es>
Date: Wed, 30 Sep 2015 15:59:12 +0000 (+0200)
Subject: Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
X-Git-Tag: oc-android-1.9^2~37^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/08d02058c83f2344304a9be9a8ca10525163163d?ds=inline

Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
---

diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index 09c4581e..0bc990ff 100644
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -361,7 +361,7 @@ public class UploadFileOperation extends RemoteOperation {
                 }
 
             } else if (result.getHttpCode() == HttpStatus.SC_PRECONDITION_FAILED ) {
-                result = new RemoteOperationResult(ResultCode.CONFLICT);
+                result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
             }
 
         } catch (Exception e) {