From 2a67e12d555e097b10e40b8739d9e79ac34dc183 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 20 Jun 2018 13:59:35 -0400 Subject: [PATCH] (fix) fixed EAS search operation --- ActiveSync/SOGoActiveSyncDispatcher.m | 9 ++++++++- NEWS | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index dd5dc0871..ac9a7e143 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -3067,7 +3067,7 @@ void handle_eas_terminate(int signum) - (void) processSearchMailbox: (id ) theDocumentElement inResponse: (WOResponse *) theResponse { - NSString *folderId, *realCollectionId, *itemId; + NSString *folderId, *realCollectionId, *itemId, *bodyPreferenceType, *mimeSupport; NSMutableArray *folderIdentifiers; SOGoMailAccounts *accountsFolder; SOGoMailAccount *accountFolder; @@ -3091,6 +3091,13 @@ void handle_eas_terminate(int signum) return; } + bodyPreferenceType = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"BodyPreference"] lastObject] getElementsByTagName: @"Type"] lastObject] textValue]; + [context setObject: bodyPreferenceType forKey: @"BodyPreferenceType"]; + mimeSupport = [[(id)[theDocumentElement getElementsByTagName: @"MIMESupport"] lastObject] textValue]; + [context setObject: mimeSupport forKey: @"MIMESupport"]; + + [context setObject: @"8" forKey: @"MIMETruncation"]; + // FIXME: support more than one CollectionId tag + DeepTraversal folderId = [[(id)[[(id)[theDocumentElement getElementsByTagName: @"Query"] lastObject] getElementsByTagName: @"CollectionId"] lastObject] textValue]; folderIdentifiers = [NSMutableArray array]; diff --git a/NEWS b/NEWS index 4f7672317..af49f5d37 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Bug fixes - [web] prevent deletion of special folders using del key - [eas] improved alarms syncing with EAS devices (#4351) - [eas] avoid potential cache update when breaking sync queries (#4422) + - [eas] fixed EAS search New features - [core] full S/MIME support