From 350fe2e7e0fe5d239219b0867e3295af83d26600 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 5 Nov 2015 14:58:58 -0500 Subject: [PATCH] (fix) one more fix for #3118 --- ActiveSync/SOGoActiveSyncDispatcher.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 24993aae3..013a4a226 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -849,8 +849,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. currentFolder = [[[[context activeUser] homeFolderInContext: context] lookupName: folderType inContext: context acquire: NO] lookupName: [cKey substringFromIndex: [cKey rangeOfString: @"/"].location+1] inContext: context acquire: NO]; + // We skip personal GCS folders - we always want to synchronize these + if ([currentFolder isKindOfClass: [SOGoGCSFolder class]] && + [[currentFolder nameInContainer] isEqualToString: @"personal"]) + continue; + // Remove the folder from device if it doesn't exist, we don't want to sync it, or it doesn't have the proper permissions - // No need to check for personal folders here since they can't be deleted if (!currentFolder || ![currentFolder synchronize] || [sm validatePermission: SoPerm_DeleteObjects