From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 21 Aug 2015 12:20:50 +0000 (+0200)
Subject: Safe blanket to clean DB if wrong conflicts keep stored
X-Git-Tag: oc-android-1.9^2~37^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b8a3dc71e483b0a0e87da8f88e0382b62d1f4caf?ds=inline;hp=--cc

Safe blanket to clean DB if wrong conflicts keep stored
---

b8a3dc71e483b0a0e87da8f88e0382b62d1f4caf
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 1998181c..e7ced8ee 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -263,7 +263,11 @@ public class SynchronizeFileOperation extends SyncOperation {
                     result = new RemoteOperationResult(ResultCode.OK);
                 }
 
-            } 
+                // safe blanket: sync'ing a not in-conflict file will clean wrong conflict markers in ancestors
+                if (result.getCode() != ResultCode.SYNC_CONFLICT) {
+                    getStorageManager().saveConflict(mLocalFile, false);
+                }
+            }
 
         }