From 677df619fdd271b960c73829c4a57e7bc01db21a Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 22 Sep 2016 11:42:28 -0400 Subject: [PATCH] (fix) compiler fixes + first round of iOS fixes --- ActiveSync/SOGoActiveSyncDispatcher+Sync.m | 2 +- ActiveSync/SOGoActiveSyncDispatcher.m | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m index bb34ca5da..a8f44d2c5 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m +++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m @@ -115,7 +115,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @implementation SOGoActiveSyncDispatcher (Sync) - (void) _setOrUnsetSyncRequest: (BOOL) set - collections: (NSArray *) collections + collections: (NSArray *) collections { SOGoCacheGCSObject *o; NSNumber *processIdentifier; diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index d1a0d10b1..7e44209da 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -290,8 +290,6 @@ void handle_eas_terminate(int signum) return theIdToTranslate; } - - // // // @@ -2798,17 +2796,17 @@ void handle_eas_terminate(int signum) - (EOQualifier *) _qualifierFromMailboxSearchQuery: (id ) theDocumentElement { - id *andElement, *freeTextElement, *greaterThanElement; + id andElement, freeTextElement, greaterThanElement; - andElement = [[theDocumentElement getElementsByTagName: @"And"] lastObject]; + andElement = [(id)[theDocumentElement getElementsByTagName: @"And"] lastObject]; if (andElement) { EOQualifier *qualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier; NSString *query; id o; - freeTextElement = [[andElement getElementsByTagName: @"FreeText"] lastObject]; - query = [freeTextElement textValue]; + freeTextElement = [(id)[andElement getElementsByTagName: @"FreeText"] lastObject]; + query = [(id)freeTextElement textValue]; greaterThanQualifier = nil; if (!query) @@ -2816,10 +2814,10 @@ void handle_eas_terminate(int signum) // We check for the date ranges - we only support the GreaterThan since // the IMAP protocol is limited in this regard - greaterThanElement = [[andElement getElementsByTagName: @"GreaterThan"] lastObject]; - if (greaterThanElement && [[greaterThanElement getElementsByTagName: @"DateReceived"] lastObject]) + greaterThanElement = [(id)[andElement getElementsByTagName: @"GreaterThan"] lastObject]; + if (greaterThanElement && [(id)[greaterThanElement getElementsByTagName: @"DateReceived"] lastObject]) { - o = [[[greaterThanElement getElementsByTagName: @"Value"] lastObject] textValue]; + o = [[(id)[greaterThanElement getElementsByTagName: @"Value"] lastObject] textValue]; greaterThanQualifier = [EOQualifier qualifierWithQualifierFormat: @"(DATE >= %@)", [o calendarDate]]; } @@ -2884,7 +2882,7 @@ void handle_eas_terminate(int signum) int i, total; // FIXME: support more than one CollectionId tag + DeepTraversal - folderId = [[[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue]; + folderId = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue]; realCollectionId = [folderId realCollectionIdWithFolderType: &folderType]; realCollectionId = [self globallyUniqueIDToIMAPFolderName: realCollectionId type: folderType]; @@ -2923,6 +2921,7 @@ void handle_eas_terminate(int signum) for (i = 0; i < total; i++) { [s appendString: @""]; + [s appendFormat: @"%@", folderId]; [s appendString: @""]; itemId = [[sortedUIDs objectAtIndex: i] stringValue]; mailObject = [currentFolder lookupName: itemId inContext: context acquire: NO];