From 948553dce3d6d968a2e85c335aff54ac5a6dc76f Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 14 Jan 2014 13:50:17 -0500 Subject: [PATCH] Properly extract the foldername --- ActiveSync/SOGoActiveSyncDispatcher.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 96c6ad1d4..e823f2d52 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -240,7 +240,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. id currentFolder; NSException *error; - serverId = [[(id)[theDocumentElement getElementsByTagName: @"ServerId"] lastObject] textValue]; + SOGoMicrosoftActiveSyncFolderType folderType; + + + serverId = [[[(id)[theDocumentElement getElementsByTagName: @"ServerId"] lastObject] textValue] realCollectionIdWithFolderType: &folderType]; parentId = [[(id)[theDocumentElement getElementsByTagName: @"ParentId"] lastObject] textValue]; displayName = [[(id)[theDocumentElement getElementsByTagName: @"DisplayName"] lastObject] textValue]; @@ -248,7 +251,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. accountsFolder = [userFolder lookupName: @"Mail" inContext: context acquire: NO]; currentFolder = [accountsFolder lookupName: @"0" inContext: context acquire: NO]; - folderToUpdate = [currentFolder lookupName: serverId + folderToUpdate = [currentFolder lookupName: [NSString stringWithFormat: @"folder%@", serverId] inContext: context acquire: NO];