amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-24 07:32:44 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 9d3573216e60e7dd9cd8ed6a20ed05126c35cc55

Browse Source 
Monotone-Revision: 0ba3fa1a82dc1f0c5096914a7415602564beb50e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-07T20:58:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-07 20:58:08 +00:00
parent 67f1bb3ca6
commit 453b240377
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
OpenChange/MAPIStoreMailFolder.m
View File

@@ -469,7 +469,8 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
{
BOOL rc = YES;
uint64_t newChangeNum;
NSNumber *ti, *changeNumber, *modseq, *lastModseq, *nextModseq, *uid;
NSNumber *ti, *changeNumber, *modseq, *lastModseq, *nextModseq,
*lastDeletedModseq, *uid;
uint64_t lastModseqNbr;
EOQualifier *searchQualifier;
NSArray *uids;
@@ -566,16 +567,22 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
ldb_transaction_commit([[self context] connectionInfo]->oc_ctx);
foundChange = YES;
[currentProperties setObject: lastModseq forKey: @"SyncLastModseq"];
}
if (lastModseq)
lastDeletedModseq
= [currentProperties objectForKey: @"SyncLastDeletedModseq"];
if (lastDeletedModseq)
{
/* FIXME: the problem here is that if a delete is the last operation
performed on a folder, the SyncLastSynchronisationDate will continuously
get updated until a new modseq shows up */
foundChange |= [[(SOGoMailFolder *) sogoObject
fetchUIDsOfVanishedItems: lastModseqNbr]
count] > 0;
lastModseqNbr = [lastDeletedModseq unsignedLongLongValue];
uids = [(SOGoMailFolder *) sogoObject
fetchUIDsOfVanishedItems: lastModseqNbr];
if ([uids count] > 0)
{
foundChange = YES;
[currentProperties setObject: uids
forKey: @"SyncLastDeletedUIDs"];
}
}
if (foundChange)
@@ -583,7 +590,6 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
ti = [NSNumber numberWithDouble: [now timeIntervalSince1970]];
[currentProperties setObject: ti
forKey: @"SyncLastSynchronisationDate"];
[currentProperties setObject: lastModseq forKey: @"SyncLastModseq"];
[versionsMessage appendProperties: currentProperties];
[versionsMessage save];
}
@@ -726,8 +732,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
NSArray *deletedKeys, *deletedUIDs;
NSNumber *changeNumNbr;
uint64_t modseq;
NSDictionary *versionProperties; // , *status;
NSMutableDictionary *messages, *mapping;
NSMutableDictionary *currentProperties, *messages;
NSNumber *newChangeNumNbr; // , *highestModseq;
uint64_t newChangeNum;
NSUInteger count, max;
@@ -739,28 +744,25 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
unsignedLongLongValue];
if (modseq > 0)
{
// status
// = [sogoObject
// statusForFlags: [NSArray arrayWithObject: @"HIGHESTMODSEQ"]];
// highestModseq = [status objectForKey: @"highestmodseq"];
versionProperties = [versionsMessage properties];
messages = [versionProperties objectForKey: @"Messages"];
deletedUIDs = [(SOGoMailFolder *) sogoObject
fetchUIDsOfVanishedItems: modseq];
deletedKeys = [deletedUIDs stringsWithFormat: @"%@.eml"];
max = [deletedUIDs count];
if (max > 0)
currentProperties = [[versionsMessage properties] mutableCopy];
deletedUIDs = [currentProperties objectForKey: @"SyncLastDeletedUIDs"];
if ([deletedUIDs count] > 0)
{
[currentProperties removeObjectForKey: @"SyncLastDeletedUIDs"];
[currentProperties setObject: changeNumNbr
forKey: @"SyncLastDeletedModseq"];
messages = [currentProperties objectForKey: @"Messages"];
[messages removeObjectsForKeys: deletedUIDs];
mapping = [versionProperties objectForKey: @"VersionsMapping"];
[versionsMessage appendProperties: currentProperties];
[versionsMessage save];
deletedKeys = [deletedUIDs stringsWithFormat: @"%@.eml"];
max = [deletedKeys count];
for (count = 0; count < max; count++)
newChangeNum = [[self context] getNewChangeNumber];
newChangeNumNbr = [NSNumber numberWithUnsignedLongLong: newChangeNum];
*cnNbr = newChangeNumNbr;
[mapping setObject: newChangeNumNbr forKey: @"SyncLastModseq"];
[versionsMessage save];
}
}
else