From 3c16ada230811bd7e90ef005979bf8f804abd25a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 30 May 2011 21:21:39 +0000
Subject: [PATCH] Monotone-Parent: 9c0b64b5164d0b1f7b8b0a271122eb860a1f14df
 Monotone-Revision: b530204fe558f57d05223cf4090c57cbaaf4bdd9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-05-30T21:21:39
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                      |  4 +++
 SoObjects/SOGo/SOGoGCSFolder.m | 45 +++++++++-------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42bf6b594..6ebb5bf54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoGCSFolder.m (-davCollectionTag): base the
+	return value on the new -[GCSFolder lastModificationDate] method.
+	(_isValidSyncToken): same as above.
+
 	* OpenChange/NSDate+MAPIStore.[hm]: renamed from
 	NSCalendarDate+MAPIStore.[hm]. Provides the same methods as
 	before but on NSDate rather than NSCalendarDate.
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 3eb0c742d..081bd4a9c 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -820,41 +820,15 @@ static NSArray *childRecordFields = nil;
     }
 }
 
-- (int) _lastModified
-{
-  NSArray *records;
-  GCSFolder *folder;
-  EOFetchSpecification *cTagSpec;
-  EOSortOrdering *ordering;
-  NSNumber *lastModified;
-  int value;
-
-  folder = [self ocsFolder];
-  ordering = [EOSortOrdering sortOrderingWithKey: @"c_lastmodified"
-                                        selector: EOCompareDescending];
-  cTagSpec = [EOFetchSpecification
-                   fetchSpecificationWithEntityName: [folder folderName]
-                                          qualifier: nil
-                                      sortOrderings: [NSArray arrayWithObject: ordering]];
-
-  records = [folder fetchFields: [NSArray arrayWithObject: @"c_lastmodified"]
-		    fetchSpecification: cTagSpec
-		    ignoreDeleted: NO];
-  if ([records count])
-    {
-      lastModified = [[records objectAtIndex: 0]
-                       objectForKey: @"c_lastmodified"];
-      value = [lastModified intValue];
-    }
-  else
-    value = -1;
-
-  return value;
-}
-
 - (NSString *) davCollectionTag
 {
-  return [NSString stringWithFormat: @"%d", [self _lastModified]];
+  NSCalendarDate *lmDate;
+
+  lmDate = [[self ocsFolder] lastModificationDate];
+
+  return [NSString stringWithFormat: @"%d",
+                   (lmDate ? [lmDate timeIntervalSince1970]
+                    : -1)];
 }
 
 - (BOOL) userIsSubscriber: (NSString *) subscribingUser
@@ -1303,6 +1277,7 @@ static NSArray *childRecordFields = nil;
   unichar *characters;
   int count, max, value;
   BOOL valid;
+  NSCalendarDate *lmDate;
 
   max = [syncToken length];
   if (max > 0)
@@ -1315,6 +1290,8 @@ static NSArray *childRecordFields = nil;
         valid = YES;
       else
         {
+          lmDate = [[self ocsFolder] lastModificationDate];
+
           valid = YES;
           value = 0;
           for (count = 0; valid && count < max; count++)
@@ -1325,7 +1302,7 @@ static NSArray *childRecordFields = nil;
               else
                 value = value * 10 + characters[count] - '0'; 
             }
-          valid |= (value <= [self _lastModified]);
+          valid |= (value <= (int) [lmDate timeIntervalSince1970]);
         }
       NSZoneFree (NULL, characters);
     }