From 70b3ff4b5c8f327777c47b700ad563ca55eb6307 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 3 Nov 2016 13:50:03 -0400 Subject: [PATCH] (feat) we now also search on the send for EAS Search ops --- ActiveSync/SOGoActiveSyncDispatcher.m | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 2facf1276..56f6b403f 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -2848,7 +2848,7 @@ void handle_eas_terminate(int signum) andElement = [(id)[theDocumentElement getElementsByTagName: @"And"] lastObject]; if (andElement) { - EOQualifier *qualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier; + EOQualifier *subjectQualifier, *senderQualifier, *fetchQualifier, *notDeleted, *greaterThanQualifier, *orQualifier; NSString *query; id o; @@ -2870,8 +2870,12 @@ void handle_eas_terminate(int signum) } notDeleted = [EOQualifier qualifierWithQualifierFormat: @"(not (flags = %@))", @"deleted"]; - qualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"subject", query]]; - fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers: notDeleted, qualifier, greaterThanQualifier, nil]; + subjectQualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"subject", query]]; + senderQualifier = [EOQualifier qualifierWithQualifierFormat: [NSString stringWithFormat: @"(%@ doesContain: '%@')", @"from", query]]; + + orQualifier = [[EOOrQualifier alloc] initWithQualifiers: subjectQualifier, senderQualifier, nil]; + + fetchQualifier = [[EOAndQualifier alloc] initWithQualifiers: notDeleted, orQualifier, greaterThanQualifier, nil]; return [fetchQualifier autorelease]; }