Merge branch 'master' into sync_full_folder

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

diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index 09c4581..0bc990f 100644 (file)
--- 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 ) {
                 }
 
             } else if (result.getHttpCode() == HttpStatus.SC_PRECONDITION_FAILED ) {

-                result = new RemoteOperationResult(ResultCode.CONFLICT);
+                result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);

             }
 
         } catch (Exception e) {
             }
 
         } catch (Exception e) {