Removed conflict badge when conflict is solved

[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / FileDataStorageManager.java

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 2c513c4..e6c35f7 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -509,6 +509,7 @@ public class FileDataStorageManager {
                         // maybe unnecessary, but should be checked TODO remove if unnecessary
                         file.setStoragePath(null);
                         saveFile(file);
                         // maybe unnecessary, but should be checked TODO remove if unnecessary
                         file.setStoragePath(null);
                         saveFile(file);

+                        saveConflict(file, false);

                     }
                 }
             }
                     }
                 }
             }


@@ -1589,6 +1590,9 @@ public class FileDataStorageManager {
     }
 
     public void saveConflict(OCFile file, boolean inConflict) {
     }
 
     public void saveConflict(OCFile file, boolean inConflict) {

+        if (!file.isDown()) {
+            inConflict = false;
+        }

         ContentValues cv = new ContentValues();
         cv.put(ProviderTableMeta.FILE_IN_CONFLICT, inConflict);
         int updated = 0;
         ContentValues cv = new ContentValues();
         cv.put(ProviderTableMeta.FILE_IN_CONFLICT, inConflict);
         int updated = 0;