From: masensio <masensio@solidgear.es>
Date: Thu, 29 Oct 2015 16:13:24 +0000 (+0100)
Subject: Detect conflict when local and server version are changed
X-Git-Tag: oc-android-1.9^2~37^2~1^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3444d61be813114be86c0a77d364189013c12e32?ds=inline;hp=--cc

Detect conflict when local and server version are changed
---

3444d61be813114be86c0a77d364189013c12e32
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 4c2030e8..b8da4a1f 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -404,7 +404,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
                     /// this should result in direct upload of files that were locally modified
                     SynchronizeFileOperation operation = new SynchronizeFileOperation(
                             child,
-                            (child.getEtagInConflict() != null ? null : child),
+                            (child.getEtagInConflict() != null ? child : null),
                             mAccount,
                             true,
                             mContext