amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-17 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity

fix(eas): handle module constraints

Browse Source 
Fixes #5456
This commit is contained in:
Francis Lachapelle
2022-01-13 08:42:07 -05:00
parent b7171be1da
commit 39e1ef5319
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ActiveSync/SOGoActiveSyncDispatcher.m
View File

@@ -329,7 +329,9 @@ void handle_eas_terminate(int signum)
case ActiveSyncEventFolder:
case ActiveSyncTaskFolder:
{
collection = [[[[context activeUser] homeFolderInContext: context] lookupName: @"Calendar" inContext: context acquire: NO] lookupName: theCollectionId inContext: context acquire: NO];
collection = [[[context activeUser] homeFolderInContext: context] lookupName: @"Calendar" inContext: context acquire: NO];
if (![collection isKindOfClass: [NSException class]])
collection = [collection lookupName: theCollectionId inContext: context acquire: NO];
if (!collection || ([collection isKindOfClass: [NSException class]]))
collection = nil;
}
@@ -1123,14 +1125,16 @@ void handle_eas_terminate(int signum)
[[o properties] removeObjectForKey: @"CleanoutDate"];
[o save];
command_count++;
}
}
folders = [NSMutableArray array];
// We get the list of subscribed calendars
folders = [[[[[context activeUser] homeFolderInContext: context] lookupName: @"Calendar" inContext: context acquire: NO] subFolders] mutableCopy];
[folders autorelease];
if ([personalFolderName length])
[folders addObjectsFromArray: [[[[context activeUser] homeFolderInContext: context] lookupName: @"Calendar" inContext: context acquire: NO] subFolders]];
// We get the list of subscribed address books
[folders addObjectsFromArray: [[[[context activeUser] homeFolderInContext: context] lookupName: @"Contacts" inContext: context acquire: NO] subFolders]];