Changeset 24070

Timestamp:

06/25/2008 11:07:15 AM (5 months ago)

Author:

sholt

Message:

Track when we modify accounts. This is necessary for fast syncing support.

Files:

• branches/adium_syncservices/Frameworks/Adium Framework/Source/AIAccount.h (modified) (2 diffs)
• branches/adium_syncservices/Frameworks/Adium Framework/Source/AIAccount.m (modified) (1 diff)
• branches/adium_syncservices/Source/AdiumAccounts.m (modified) (6 diffs)

branches/adium_syncservices/Frameworks/Adium Framework/Source/AIAccount.h

@@ -144 +144 @@
-        NSMutableArray                          *delayedUpdateStatusTargets;
-        NSTimer                                         *silenceAllContactUpdatesTimer;
+        
+        //Sync Tracking
+        NSDate                                          *m_modificationDate;
-}
-
@@ -235 +238 @@
--(void)verifyCommand:(NSString*)commandName forChat:(AIChat*)chat;
-
+//synching
+- (void)accountModified;
+- (void)setModificationDate:(NSDate *)date;
+- (NSDate *)modificationDate;
-@end
-

branches/adium_syncservices/Frameworks/Adium Framework/Source/AIAccount.m

@@ -860 +860 @@
-{
-        //add stuff
+}
+
+#pragma mark Syncing
+- (void)accountModified
+{
+        if(m_modificationDate)
+                [m_modificationDate release];
+        m_modificationDate = [[NSDate date] autorelease];
+}
+
+- (void)setModificationDate:(NSDate *)date
+{
+        if(m_modificationDate)
+                [m_modificationDate release];
+        m_modificationDate = [date retain];
+}
+
+- (NSDate *)modificationDate
+{
+        return m_modificationDate;
-}
-

branches/adium_syncservices/Source/AdiumAccounts.m

@@ -30 +30 @@
-#define ACCOUNT_UID                                             @"UID"                          //Account UID
-#define ACCOUNT_OBJECT_ID                               @"ObjectID"             //Account object ID
+#define ACCOUNT_MOD_DATE                                @"ModificationDate"     //Account last updated
-
-@interface AdiumAccounts (PRIVATE)
@@ -150 +151 @@
-{
-        [accounts addObject:inAccount];
+        [inAccount accountModified];
-        [self _saveAccounts];
-}
@@ -181 +183 @@
-    [accounts moveObject:account toIndex:destIndex];
-    [self _saveAccounts];
+        [account accountModified];
-        return [accounts indexOfObject:account];
-}
@@ -191 +194 @@
-- (void)accountDidChangeUID:(AIAccount *)account
-{
+        [account accountModified];
-        [self _saveAccounts];
-}
@@ -235 +239 @@
-                NSString        *accountUID = [accountDict objectForKey:ACCOUNT_UID];
-                NSString        *internalObjectID = [accountDict objectForKey:ACCOUNT_OBJECT_ID];
+                NSDate          *accountUpdated = [accountDict objectForKey:ACCOUNT_MOD_DATE];
-
-        //Create the account and add it to our array
-        if (service && accountUID && [accountUID length]) {
-                        if ((newAccount = [service accountWithUID:accountUID internalObjectID:internalObjectID])) {
-
+
+
-            } else {
-                                NSLog(@"Could not load account %@",accountDict);
@@ -342 +348 @@
-                        [flatAccount setObject:[account UID] forKey:ACCOUNT_UID];                                                       //Account UID
-                        [flatAccount setObject:[account internalObjectID] forKey:ACCOUNT_OBJECT_ID];                    //Account Object ID
+                        [flatAccount setObject:[account modificationDate] forKey:ACCOUNT_MOD_DATE];     //Account last updated date
-                        
-                        [flatAccounts addObject:flatAccount];