Merge to 2.2.7

Alinto · Jul 30, 2014 · ac6e9a5 · ac6e9a5
2 parents 04904d8 + 07324e5
commit ac6e9a5
Show file tree

Hide file tree

Showing 109 changed files with 4,664 additions and 2,995 deletions.
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -457,13 +457,12 @@ - (void) processFolderDelete: (id <DOMElement>) theDocumentElement
       NSData *d;
 
       //
-      // We mark the cache object as deleted
+      // We destroy the cache object
       //
       key = [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceId"], [folderToDelete nameInContainer]];
       o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
       [o setTableUrl: [self folderTableURL]];
-      [o reloadIfNeeded];
-      [o delete];
+      [o destroy];
 
       //
       // We update the FolderSync's synckey
@@ -697,7 +696,7 @@ - (void) processFolderSync: (id <DOMElement>) theDocumentElement
 
           if (![imapGUIDs allKeysForObject: cKey])
             {
-              // Delete folders cache content to avoid stale data if a new folder gets created with the same name
+              // Destroy folders cache content to avoid stale data if a new folder gets created with the same name
               key =  [NSString stringWithFormat: @"%@+folder%@", [context objectForKey: @"DeviceId"], [cachedGUIDs objectForKey: cKey]];
               o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
               [o setObjectType: ActiveSyncFolderCacheObject];
@@ -711,8 +710,7 @@ - (void) processFolderSync: (id <DOMElement>) theDocumentElement
                   command_count++;
                 }
 
-              [[o properties] removeAllObjects];
-              [o save];
+              [o destroy];
             }
         }