LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) fix search on for Outlook application (#4605 and #4607)

pull/246/head
Ludovic Marcotte 2018-11-29 14:08:10 -05:00
parent adf2d395e3
commit 596e3326a2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ActiveSync/SOGoActiveSyncDispatcher.m
View File

@ -3077,7 +3077,8 @@ void handle_eas_terminate(int signum)
folderIdentifiers = [NSMutableArray array]; folderIdentifiers = [NSMutableArray array];
// Android 6 will send search requests with no collection ID - so we search in all folders. // Android 6 will send search requests with no collection ID - so we search in all folders.
if (!folderId) // Outlook Mobile App sends search requests with CollectionId=0 - We treat this as an all-folder-search.
if (!folderId || [folderId isEqualToString: @"0"])
{ {
NSArray *foldersInCache; NSArray *foldersInCache;
SOGoCacheGCSObject *o; SOGoCacheGCSObject *o;
@ -3145,7 +3146,7 @@ void handle_eas_terminate(int signum)
[s appendFormat: @"<LongId>%@+%@</LongId>", folderId, itemId]; [s appendFormat: @"<LongId>%@+%@</LongId>", folderId, itemId];
[s appendFormat: @"<CollectionId xmlns=\"AirSyncBase:\">%@</CollectionId>", folderId]; [s appendFormat: @"<CollectionId xmlns=\"AirSyncBase:\">%@</CollectionId>", folderId];
[s appendString: @"<Properties>"]; [s appendString: @"<Properties>"];
[s appendFormat: [mailObject activeSyncRepresentationInContext: context]]; [s appendString: [mailObject activeSyncRepresentationInContext: context]];
[s appendString: @"</Properties>"]; [s appendString: @"</Properties>"];
[s appendFormat: @"</Result>"]; [s appendFormat: @"</Result>"];
} }
@ -3948,6 +3949,8 @@ void handle_eas_terminate(int signum)
[map setObject: [currentAttachment objectForKey: @"mimetype"] forKey: @"content-type"]; [map setObject: [currentAttachment objectForKey: @"mimetype"] forKey: @"content-type"];
[map setObject: [currentAttachment objectForKey: @"encoding"] forKey: @"content-transfer-encoding"]; [map setObject: [currentAttachment objectForKey: @"encoding"] forKey: @"content-transfer-encoding"];
[map addObject: [NSString stringWithFormat: @"attachment; filename=\"%@\"", [currentAttachment objectForKey: @"filename"]] forKey: @"content-disposition"]; [map addObject: [NSString stringWithFormat: @"attachment; filename=\"%@\"", [currentAttachment objectForKey: @"filename"]] forKey: @"content-disposition"];
if ([[currentAttachment objectForKey: @"bodyId"] length])
[map setObject: [currentAttachment objectForKey: @"bodyId"] forKey: @"content-id"];
bodyPart = [[[NGMimeBodyPart alloc] initWithHeader: map] autorelease]; bodyPart = [[[NGMimeBodyPart alloc] initWithHeader: map] autorelease];
fdata = [[NGMimeFileData alloc] initWithBytes:[bodydata bytes] length:[bodydata length]]; fdata = [[NGMimeFileData alloc] initWithBytes:[bodydata bytes] length:[bodydata length]];

1
NEWS
View File

@ -14,6 +14,7 @@ Bug fixes
- [web] don't encode filename extension when exporting folders - [web] don't encode filename extension when exporting folders
- [core] don't always fetch the sorting columns - [core] don't always fetch the sorting columns
- [eas] strip '<>' from bodyId and when forwarding mails - [eas] strip '<>' from bodyId and when forwarding mails
- [eas] fix search on for Outlook application (#4605 and #4607)
4.0.4 (2018-10-23) 4.0.4 (2018-10-23)
------------------ ------------------