From: masensio <masensio@solidgear.es>
Date: Wed, 19 Mar 2014 16:17:55 +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~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/738ea33c060fdf1ebc30ae8cc952229bc59da979?hp=f5a9c9600edc35f2e5e21d1751a09ff1241c0876

Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 30acd487..9538c8cb 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 30acd4875dda3fd0bec83daaad522f3d5a02ead6
+Subproject commit 9538c8cb73eef41571c83a4440d5b62d82f5c86b
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) {