Check if the OCFile has a previous conflict before calling a sync operation

src/com/owncloud/android/datamodel/OCFile.java

@@ -636,6 +636,10 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         return mEtagInConflict;
     }
 
+    public boolean isInConflict() {
+        return mEtagInConflict != null && mEtagInConflict != "";
+    }
+
     public void setEtagInConflict(String etagInConflict) {
         mEtagInConflict = etagInConflict;
     }
@@ -652,4 +656,5 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         String permissions = getPermissions();
         return (permissions != null && permissions.contains(PERMISSION_SHARED_WITH_ME));
     }
+
 }

src/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -527,7 +527,7 @@ public class RefreshFolderOperation extends RemoteOperation {
     private void fetchFavoritesToSyncFromLocalData() {
         List<OCFile> children = mStorageManager.getFolderContent(mLocalFolder);
         for (OCFile child : children) {
-            if (!child.isFolder() && child.isFavorite()) {
+            if (!child.isFolder() && child.isFavorite() && !child.isInConflict()) {
                 SynchronizeFileOperation operation = new SynchronizeFileOperation(
                         child,
                         child,  // cheating with the remote file to get an update to server; to refactor