From 172f4fcc803e97c860f151ed8fa6b4aed6976761 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 26 Jul 2015 12:34:12 +0200 Subject: [PATCH] 3293-2 --- ActiveSync/SOGoActiveSyncDispatcher+Sync.m | 52 ++++++++++++++++++++++++---- ActiveSync/SOGoActiveSyncDispatcher.m | 5 ++- SoObjects/Mailer/SOGoMailFolder.h | 3 +- SoObjects/Mailer/SOGoMailFolder.m | 6 +++- SoObjects/SOGo/SOGoGCSFolder.h | 4 +-- SoObjects/SOGo/SOGoGCSFolder.m | 23 +++++++----- 6 files changed, 73 insertions(+), 20 deletions(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m index 950ee47..47873c3 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m +++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m @@ -133,6 +133,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; [[o properties] addEntriesFromDictionary: values]; [o save]; @@ -673,7 +674,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSDictionary *component; NSArray *allComponents; - BOOL updated; + BOOL updated, initialLoadInProgress; int deleted, return_count; if (theFolderType == ActiveSyncContactFolder) @@ -683,7 +684,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. else component_name = @"vtodo"; - allComponents = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType]; + initialLoadInProgress = NO; + + if ([theSyncKey isEqualToString: @"-1"]) + [folderMetadata setObject: davCollectionTagToStore forKey: @"InitialLoadSequence"]; + + if ([folderMetadata objectForKey: @"InitialLoadSequence"]) + { + if ([theSyncKey intValue] < [[folderMetadata objectForKey: @"InitialLoadSequence"] intValue]) + initialLoadInProgress = YES; + else + [folderMetadata removeObjectForKey: @"InitialLoadSequence"]; + } + + allComponents = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType initialLoad: initialLoadInProgress]; allComponents = [allComponents sortedArrayUsingDescriptors: [NSArray arrayWithObjects: [[NSSortDescriptor alloc] initWithKey: @"c_lastmodified" ascending:YES], nil]]; @@ -847,12 +861,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSMutableArray *allCacheObjects, *sortedBySequence; SOGoMailObject *mailObject; - NSArray *allMessages; + NSArray *allMessages, *a; + + int j, k, return_count, uidnext, highestmodseq; + BOOL found_in_cache, initialLoadInProgress; + + initialLoadInProgress = NO; - int j, k, return_count; - BOOL found_in_cache; + if ([theSyncKey isEqualToString: @"-1"]) + { + uidnext = highestmodseq = 0; + + a = [[theCollection davCollectionTag] componentsSeparatedByString: @"-"]; + [folderMetadata setObject: [a objectAtIndex: 1] forKey: @"InitialLoadSequence"]; + } + else + { + a = [theSyncKey componentsSeparatedByString: @"-"]; + uidnext = [[a objectAtIndex: 0] intValue]; + highestmodseq = [[a objectAtIndex: 1] intValue]; + } + + if ([folderMetadata objectForKey: @"InitialLoadSequence"]) + { + if (highestmodseq < [[folderMetadata objectForKey: @"InitialLoadSequence"] intValue]) + initialLoadInProgress = YES; + else + [folderMetadata removeObjectForKey: @"InitialLoadSequence"]; + } - allMessages = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType]; + allMessages = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType initialLoad: initialLoadInProgress]; max = [allMessages count]; allCacheObjects = [NSMutableArray array]; @@ -911,7 +949,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSString *lastSequence; more_available = YES; - lastSequence = ([[aCacheObject sequence] isEqual: [NSNull null]] ? @"1" : [aCacheObject sequence]); + lastSequence = ([[aCacheObject sequence] isEqual: [NSNull null]] ? [NSString stringWithFormat:@"%d", highestmodseq] : [aCacheObject sequence]); *theLastServerKey = [[NSString alloc] initWithFormat: @"%@-%@", [aCacheObject uid], lastSequence]; //NSLog(@"Reached windowSize - lastUID will be: %@", *theLastServerKey); DESTROY(pool); diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 9be2ebe..0f82e71 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -938,6 +938,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; [o save]; command_count++; @@ -1023,6 +1024,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; } [o save]; @@ -1046,6 +1048,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; } [o save]; @@ -1204,7 +1207,7 @@ static BOOL debugOn = NO; filter = [NSCalendarDate dateFromFilterType: [[(id)[[allCollections objectAtIndex: j] getElementsByTagName: @"FilterType"] lastObject] textValue]]; syncKey = [[(id)[[allCollections objectAtIndex: j] getElementsByTagName: @"SyncKey"] lastObject] textValue]; - allMessages = [currentCollection syncTokenFieldsWithProperties: nil matchingSyncToken: syncKey fromDate: filter]; + allMessages = [currentCollection syncTokenFieldsWithProperties: nil matchingSyncToken: syncKey fromDate: filter initialLoad: NO]; count = [allMessages count]; diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h index 84e51d9..8ea5953 100644 --- a/SoObjects/Mailer/SOGoMailFolder.h +++ b/SoObjects/Mailer/SOGoMailFolder.h @@ -98,7 +98,8 @@ - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken - fromDate: (NSCalendarDate *) theStartDate; + fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress; /* flags */ diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index c65c6c4..b38e9ee 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -2090,6 +2090,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) - (NSArray *) syncTokenFieldsWithProperties: (NSArray *) theProperties matchingSyncToken: (NSString *) theSyncToken fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress { EOQualifier *searchQualifier; NSMutableArray *allTokens; @@ -2166,6 +2167,9 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) for (i = 0; i < [fetchResults count]; i++) { + if ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"] && initialLoadInProgress) + continue; + d = [NSDictionary dictionaryWithObject: ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"]) ? [NSNull null] : [[fetchResults objectAtIndex: i] objectForKey: @"modseq"] forKey: [[[fetchResults objectAtIndex: i] objectForKey: @"uid"] stringValue]]; [allTokens addObject: d]; @@ -2176,7 +2180,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) if (highestmodseq == 0) highestmodseq = 1; - if (highestmodseq > 0) + if (highestmodseq > 0 && !initialLoadInProgress) { id uid; diff --git a/SoObjects/SOGo/SOGoGCSFolder.h b/SoObjects/SOGo/SOGoGCSFolder.h index 9b8de6b..578bb71 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.h +++ b/SoObjects/SOGo/SOGoGCSFolder.h @@ -128,8 +128,8 @@ - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken - fromDate: (NSCalendarDate *) theStartDate; - + fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress; /* multiget helper */ - (WOResponse *) performMultigetInContext: (WOContext *) queryContext diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 9f77359..add26d0 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -1151,6 +1151,7 @@ static NSArray *childRecordFields = nil; - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress { /* TODO: - validation: @@ -1200,13 +1201,17 @@ static NSArray *childRecordFields = nil; mRecords = [NSMutableArray arrayWithArray: [self _fetchFields: fields withQualifier: qualifier ignoreDeleted: YES]]; - qualifier = [EOQualifier qualifierWithQualifierFormat: - @"c_lastmodified > %d and c_deleted == 1", - syncTokenInt]; - fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_lastmodified", @"c_deleted", nil]; - [mRecords addObjectsFromArray: [self _fetchFields: fields - withQualifier: qualifier - ignoreDeleted: NO]]; + if (initialLoadInProgress) + { + qualifier = [EOQualifier qualifierWithQualifierFormat: + @"c_lastmodified > %d and c_deleted == 1", + syncTokenInt]; + fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_lastmodified", @"c_deleted", nil]; + [mRecords addObjectsFromArray: [self _fetchFields: fields + withQualifier: qualifier + ignoreDeleted: NO]]; + } + records = mRecords; } else @@ -1499,7 +1504,9 @@ static NSArray *childRecordFields = nil; properties = [self parseDAVRequestedProperties: propElement]; records = [self syncTokenFieldsWithProperties: properties matchingSyncToken: syncToken - fromDate: nil]; + fromDate: nil + initialLoad: NO]; + [self _appendComponentProperties: [properties allKeys] fromRecords: records matchingSyncToken: [syncToken intValue] -- 1.7.10.4