amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-18 03:38:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ejhernandez/peek-preload-bodies-for-real'

Browse Source
This commit is contained in:
Julio García
2015-03-18 09:28:22 +01:00
parent afa9061f2f 1c1a75d2c1
commit 3b0b43f28f
4 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenChange/MAPIStoreMailFolder.m
View File

@@ -1485,7 +1485,6 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
NGImap4Client *client;
NSArray *fetch;
NSData *bodyContent;
NSMutableArray *unseenUIDs;
if (tableType == MAPISTORE_MESSAGE_TABLE)
{
@@ -1496,7 +1495,6 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
{
bodyPartKeys = [NSMutableSet setWithCapacity: max];
unseenUIDs = [NSMutableArray arrayWithCapacity: max];
keyAssoc = [NSMutableDictionary dictionaryWithCapacity: max];
for (count = 0; count < max; count++)
{
@@ -1509,23 +1507,22 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
{
[bodyPartKeys addObject: bodyPartKey];
messageUid = [self messageUIDFromMessageKey: messageKey];
[keyAssoc setObject: bodyPartKey forKey: messageUid];
/* Fetch flags to remove seen flag if required,
as fetching a message body set the seen flag.
We are not using body.peek[] as
bodyContentPartKey explicitly avoids it.
/* If the bodyPartKey include peek, remove it as it is not returned
as key in the IMAP server response.
IMAP conversation example:
a4 UID FETCH 1 (UID BODY.PEEK[text])
* 1 FETCH (UID 1 BODY[TEXT] {1677}
*/
if (![message read])
{
[unseenUIDs addObject: messageUid];
}
bodyPartKey = [bodyPartKey stringByReplacingOccurrencesOfString: @"body.peek"
withString: @"body"];
[keyAssoc setObject: bodyPartKey forKey: messageUid];
}
}
}
client = [[(SOGoMailFolder *) sogoObject imap4Connection] client];
[client select: [sogoObject absoluteImap4Name]];
response = [client fetchUids: [keyAssoc allKeys]
parts: [bodyPartKeys allObjects]];
fetch = [response objectForKey: @"fetch"];
@@ -1547,14 +1544,6 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
}
}
}
/* Restore unseen state once the body has been fetched */
if ([unseenUIDs count] > 0)
{
response = [client storeFlags: [NSArray arrayWithObjects: @"seen", nil]
forUIDs: unseenUIDs
addOrRemove: NO];
}
}
}