Merge branch 'develop' into refresh_folder_contents_when_browsed_into

Conflicts:
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java

diff --cc src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge

diff --cc src/com/owncloud/android/operations/RemoteOperationResult.java
index 6b50f91,999974c..ca88210
--- 1/src/com/owncloud/android/operations/RemoteOperationResult.java
--- 2/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@@ -95,10 -98,10 +99,10 @@@ public class RemoteOperationResult impl
  
      public RemoteOperationResult(ResultCode code) {
          mCode = code;
 -        mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL);
 +        mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL || code == ResultCode.OK_NO_CHANGES_ON_DIR);
      }
  
-     public RemoteOperationResult(boolean success, int httpCode) {
+     private RemoteOperationResult(boolean success, int httpCode) {
          mSuccess = success;
          mHttpCode = httpCode;
  

diff --cc src/com/owncloud/android/operations/SynchronizeFileOperation.java
Simple merge

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index af1c5e9,67c7389..68d539c
--- 1/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -268,36 -236,42 +269,44 @@@ public class SynchronizeFolderOperatio
              } else {
                  client.exhaustResponse(query.getResponseBodyAsStream());
              }
 -            
 +
              // prepare result object
 -            if (isMultiStatus(status)) {
 +            if (!fileChanged) {
 +                result = new RemoteOperationResult(ResultCode.OK_NO_CHANGES_ON_DIR);
 +
 +            } else if (isMultiStatus(status)) {
                  if (mConflictsFound > 0  || mFailsInFavouritesFound > 0) { 
                      result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT);   // should be different result, but will do the job
 -                            
 +
                  } else {
-                     result = new RemoteOperationResult(true, status);
+                     result = new RemoteOperationResult(true, status, query.getResponseHeaders());
                  }
              } else {
-                 result = new RemoteOperationResult(false, status);
+                 result = new RemoteOperationResult(false, status, query.getResponseHeaders());
              }
 -            
 -            
 -            
 +            Log_OC.i(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage());
 +
- 
          } catch (Exception e) {
              result = new RemoteOperationResult(e);
-             Log_OC.e(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage(), result.getException());
+             
  
          } finally {
              if (query != null)
                  query.releaseConnection();  // let the connection available for other methods
+             if (result.isSuccess()) {
+                 Log_OC.i(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage());
+             } else {
+                 if (result.isException()) {
+                     Log_OC.e(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage(), result.getException());
+                 } else {
+                     Log_OC.e(TAG, "Synchronizing " + mAccount.name + ", folder " + mRemotePath + ": " + result.getLogMessage());
+                 }
+             }
          }
 -        
 +
          return result;
      }
 -    
 +
  
      public boolean isMultiStatus(int status) {
          return (status == HttpStatus.SC_MULTI_STATUS); 

diff --cc src/com/owncloud/android/providers/FileContentProvider.java
Simple merge