From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 14 Oct 2013 12:55:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into... 
X-Git-Tag: oc-android-1.5.5~155^2~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/47b7a164de81880078ed350b826198eb2edf3785?hp=d8de614d78c283d6d09849818c8043006e887256

Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into
---

diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 7610e37f..ea115f1f 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -119,7 +119,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
                         // TODO this will be always true after the app is upgraded to database version 2; will result in unnecessary uploads
               
                     /// decide action to perform depending upon changes
-                    if (localChanged && serverChanged) {
+                    if (!mLocalFile.getEtag().isEmpty() && localChanged && serverChanged) {
                         result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);
                   
                     } else if (localChanged) {