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

diff --combined src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 7610e37,2f80186..ea115f1
--- 1/src/com/owncloud/android/operations/SynchronizeFileOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@@ -27,7 -27,7 +27,7 @@@ import android.content.Context
  import android.content.Intent;
  
  import com.owncloud.android.Log_OC;
 -import com.owncloud.android.datamodel.DataStorageManager;
 +import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.files.services.FileDownloader;
  import com.owncloud.android.files.services.FileUploader;
@@@ -45,7 -45,7 +45,7 @@@ public class SynchronizeFileOperation e
      
      private OCFile mLocalFile;
      private OCFile mServerFile;
 -    private DataStorageManager mStorageManager;
 +    private FileDataStorageManager mStorageManager;
      private Account mAccount;
      private boolean mSyncFileContents;
      private boolean mLocalChangeAlreadyKnown;
@@@ -56,7 -56,7 +56,7 @@@
      public SynchronizeFileOperation(
              OCFile localFile,
              OCFile serverFile,          // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation 
 -            DataStorageManager storageManager, 
 +            FileDataStorageManager storageManager, 
              Account account, 
              boolean syncFileContents,
              boolean localChangeAlreadyKnown, 
@@@ -119,7 -119,7 +119,7 @@@
                          // 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) {