From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 20 Mar 2014 16:48:23 +0000 (+0100)
Subject: Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
X-Git-Tag: oc-android-1.5.5~5^2~3^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4f4c6843a7d8c160def6030e49ccef2083158c49?hp=4d3661299ba2f13e0451fb2875a8bee2ad688fdf

Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
---

diff --git a/owncloud-android-library b/owncloud-android-library
index ae2f5b48..a82d8129 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit ae2f5b48b86015642998bf515a978db380c88787
+Subproject commit a82d8129444193c769c03ca7623015725f3dec50
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 5d957071..3176ba38 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -192,11 +192,8 @@ public class SynchronizeFolderOperation extends RemoteOperation {
             sendLocalBroadcast(EVENT_SINGLE_FOLDER_CONTENTS_SYNCED, mLocalFolder.getRemotePath(), result);
         }
         
-        if (result.isSuccess() && mIsShareSupported) {
-            RemoteOperationResult shareResult = refreshSharesForFolder(client);
-            if (shareResult.getCode() != ResultCode.FILE_NOT_FOUND) {
-                result = shareResult;
-            } // else , keep the previous result ; being conservative for servers where Sharing API is supported, but disabled
+        if (result.isSuccess() && mIsShareSupported && !mSyncFullAccount) {
+            refreshSharesForFolder(client); // share result is ignored 
         }
         
         if (!mSyncFullAccount) {