Changeset 273

Timestamp:

03/16/09 15:45:42 (4 years ago)

Author:

henri

Message:

Major refactoring of data handling to solve synch issue

Location:

apps/iphone/my.tel/trunk/Classes

Files:

• GroupFriendsController.h (modified) (1 diff)
• GroupFriendsController.m (modified) (10 diffs)

apps/iphone/my.tel/trunk/Classes/GroupFriendsController.h

@@ -50 +50 @@
 - (void)getGroupFriends;
 - (void)getAllFriends;
-- (void)setSelectedFriends;
 - (void)syncGroupFriends;
 - (void)addFriends:(NSArray *)friendsIdList;

apps/iphone/my.tel/trunk/Classes/GroupFriendsController.m

@@ -6 +6 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
-// TODO: Don't call getAllFriends until the guy chooses to edit.
-// When he clicks edit, run an activity indicator and get all friends (if not cached) synchronously
-// Then set selectedFriends and show the table
-// Also implement the buttons UI
 
 #import "GroupFriendsController.h"
@@ -34 +30 @@
         [gFC initVars];
         gFC.theGroup = aGroup;
-        [gFC getGroupFriends];
         [gFC getAllFriends];
         return gFC;
@@ -52 +47 @@
         [deleteButton addTarget:self action:@selector(didClickDelete:) forControlEvents:UIControlEventTouchUpInside];
         deleteButton.autoresizingMask = (UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight);
-        
+                
         nTrue = [[NSNumber numberWithBool:TRUE] retain];
         nFalse = [[NSNumber numberWithBool:FALSE] retain];
@@ -139 +134 @@
 #endif
         if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
-                if (friendsArray)
-                        [friendsArray release];
+                if (!selectedFriends) {
+                        selectedFriends = [[NSMutableArray arrayWithCapacity:[allFriendsArray count]] retain];
+                } else {
+                        [selectedFriends removeAllObjects];
+                }
+                if (!friendsArray) {
+                        friendsArray = [[NSMutableArray arrayWithCapacity:[allFriendsArray count]] retain];
+                } else {
+                        [friendsArray removeAllObjects];
+                }
                 if ([parsedJson objectForKey:@"friendList"] != [NSNull null]) {
-                        friendsArray = [[parsedJson objectForKey:@"friendList"] retain];
+                        // set all selected friends
+                        NSMutableArray *groupFriendsIds = [NSMutableArray arrayWithCapacity:[allFriendsArray count]];
+                        NSEnumerator *allEnum = [allFriendsArray objectEnumerator];
+                        NSEnumerator *fEnum = [[parsedJson objectForKey:@"friendList"] objectEnumerator];
+                        NSDictionary *aFriend;
+                        while ((aFriend = [fEnum nextObject])) {
+                                [groupFriendsIds addObject:(NSString *)[aFriend objectForKey:@"id"]];
+                        }
+                        while ((aFriend = [allEnum nextObject])) {
+                                if ([groupFriendsIds containsObject:[aFriend objectForKey:@"id"]]) {
+                                        [selectedFriends addObject:nTrue];
+                                        [friendsArray addObject:aFriend];
+                                } else {
+                                        [selectedFriends addObject:nFalse];
+                                }
+                        }
+                        
                 } else {
-                        friendsArray = [[NSMutableArray array] retain];
-                }
+                        // no friends, set selectedFriends to be all nFalse
+                        NSUInteger i, count = [allFriendsArray count];
+                        for (i = 0; i < count; i++) {
+                                [selectedFriends addObject:nFalse];
+                        }
+                }
+                [theTable reloadData];  
+                self.navigationItem.rightBarButtonItem.enabled = YES;
         } else {
                 [Group throwJsonErrorAlert:parsedJson];
         }
-        [theTable reloadData];  
 }
 
@@ -160 +184 @@
                         [allFriendsArray release];
                 if ([parsedJson objectForKey:@"friendList"] != [NSNull null]) {
-                        allFriendsArray = [[parsedJson objectForKey:@"friendList"] retain];
+                        allFriendsArray = [[NSMutableArray arrayWithArray:[parsedJson objectForKey:@"friendList"]] retain];
                 }else {
                         allFriendsArray = [[NSMutableArray array] retain];
                 }
+                [self getGroupFriends];
         } else {
                 [Group throwJsonErrorAlert:parsedJson];
-        }
-        [self setSelectedFriends];
-        if (theTable.editing) {
-                [theTable reloadData];
         }
 }
@@ -233 +254 @@
         [conn performLookup:TRUE];
         [requestData release];  
-}
-
-- (void)setSelectedFriends {
-        // Array of active friends as NSNumber (actually BOOL) flags, which match the list of all friends
-        if (selectedFriends) {
-                [selectedFriends release];
-        }
-        selectedFriends = [[NSMutableArray arrayWithCapacity:[allFriendsArray count]] retain];
-        NSMutableArray *groupFriendsIds = [NSMutableArray arrayWithCapacity:[allFriendsArray count]];
-        NSEnumerator *allEnum = [allFriendsArray objectEnumerator];
-        NSEnumerator *fEnum = [friendsArray objectEnumerator];
-        NSDictionary *aFriend;
-        while ((aFriend = [fEnum nextObject])) {
-                [groupFriendsIds addObject:(NSString *)[aFriend objectForKey:@"id"]];
-        }
-        while ((aFriend = [allEnum nextObject])) {
-                if ([groupFriendsIds containsObject:[aFriend objectForKey:@"id"]]) {
-                        [selectedFriends addObject:nTrue];
-                } else {
-                        [selectedFriends addObject:nFalse];
-                }
-        }
 }
 
@@ -362 +361 @@
         } else {
                 self.navigationItem.rightBarButtonItem = [self editButtonItem];
+                // disable editing until we've loaded the data
+                self.navigationItem.rightBarButtonItem.enabled = NO;
                 deleteButton.enabled = YES;
         }
@@ -375 +376 @@
 - (void)dealloc {
     [super dealloc];
+        if (selectedFriends)
         [selectedFriends release];
         if (friendsArray)
@@ -459 +461 @@
         // If editing, show all the friends, with the ones currently selected with the checkmark
         // If not editing, simply show all the current friends
+        cell.text = [[friendsArray objectAtIndex:indexPath.row] valueForKey:@"name"];
         if (! tableView.editing) {
-                cell.text = [[friendsArray objectAtIndex:indexPath.row] valueForKey:@"name"];
-                cell.accessoryType = UITableViewCellAccessoryNone;
+                cell.accessoryType = UITableViewCellAccessoryCheckmark;
                 cell.backgroundColor = [UIColor whiteColor];
         } else {
-                cell.text = [[allFriendsArray objectAtIndex:indexPath.row] valueForKey:@"name"];
                 if ([selectedFriends objectAtIndex:indexPath.row] == nTrue) {
                         // it's a selected friend
@@ -510 +511 @@
         [super setEditing:editing animated:animated];
         if (editing) {
+                // Grow the friendsArray to add the objects from allFriendsArray
                 theTable.editing = YES;
-        } else {
+                NSUInteger i, count = [selectedFriends count];
+                NSMutableArray *insertIndexPaths = [NSMutableArray arrayWithCapacity:count];
+                for (i = 0; i < count; i++) {
+                        if ([selectedFriends objectAtIndex:i] == nFalse) {
+                                [friendsArray insertObject:[allFriendsArray objectAtIndex:i] atIndex:i];
+                                [insertIndexPaths addObject:[NSIndexPath indexPathForRow:i inSection:0]];
+                        }
+                }
+                [theTable beginUpdates];
+                [theTable insertRowsAtIndexPaths:insertIndexPaths withRowAnimation:UITableViewRowAnimationTop];
+                [theTable endUpdates];
+        } else {
+                // Shrink the friendsArray to remove the objects from allFriendsArray
                 theTable.editing = NO;
+                NSUInteger i, count = [selectedFriends count];
+                NSMutableArray *deleteIndexPaths = [NSMutableArray arrayWithCapacity:count];
+                NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
+                for (i = 0; i < count; i++) {
+                        NSLog(@"working on index: %d", i);
+                        if ([selectedFriends objectAtIndex:i] == nFalse) {
+                                [indexes addIndex:i];
+                                [deleteIndexPaths addObject:[NSIndexPath indexPathForRow:i inSection:0]];
+                        }                       
+                }
+                [friendsArray removeObjectsAtIndexes:indexes];
+                [theTable beginUpdates];
+                [theTable deleteRowsAtIndexPaths:deleteIndexPaths withRowAnimation:UITableViewRowAnimationTop];
+                [theTable endUpdates];
                 [self syncGroupFriends];
         }
-        [theTable reloadData];
 }