Performance improvement.

AGImagePickerController Demo/AGViewController.m

@@ -173,7 +173,7 @@ - (void)openAction:(id)sender
     [selectAll release];
     [deselectAll release];
 
-    imagePickerController.maximumNumberOfPhotos = 3;
+//    imagePickerController.maximumNumberOfPhotos = 3;
     [self presentModalViewController:imagePickerController animated:YES];
     [imagePickerController release];
 }

AGImagePickerController/AGIPCAlbumsController.h

@@ -18,6 +18,6 @@
     UITableView *tableView;
 }
 
-@property (nonatomic, retain) IBOutlet UITableView *tableView;
+@property (retain) IBOutlet UITableView *tableView;
 
 @end

AGImagePickerController/AGIPCAssetsController.h

@@ -22,10 +22,10 @@
     NSMutableArray *assets;
 }
 
-@property (nonatomic, retain) ALAssetsGroup *assetsGroup;
-@property (nonatomic, retain) IBOutlet UITableView *tableView;
+@property (retain) ALAssetsGroup *assetsGroup;
+@property (retain) IBOutlet UITableView *tableView;
 
-@property (nonatomic, readonly) NSArray *selectedAssets;
+@property (readonly) NSArray *selectedAssets;
 
 - (id)initWithAssetsGroup:(ALAssetsGroup *)theAssetsGroup;
 

AGImagePickerController/AGIPCAssetsController.m

@@ -66,14 +66,29 @@ - (BOOL)toolbarHidden
 
 - (void)setAssetsGroup:(ALAssetsGroup *)theAssetsGroup
 {
-    if (assetsGroup != theAssetsGroup)
+    @synchronized (self)
     {
-        [assetsGroup release];
-        assetsGroup = [theAssetsGroup retain];
-        [assetsGroup setAssetsFilter:[ALAssetsFilter allPhotos]];
+        if (assetsGroup != theAssetsGroup)
+        {
+            [assetsGroup release];
+            assetsGroup = [theAssetsGroup retain];
+            [assetsGroup setAssetsFilter:[ALAssetsFilter allPhotos]];
+
+            [self reloadData];
+        }
+    }
+}
 
-        [self reloadData];
+- (ALAssetsGroup *)assetsGroup
+{
+    ALAssetsGroup *ret = nil;
+
+    @synchronized (self)
+    {
+        ret = [[assetsGroup retain] autorelease];
     }
+
+    return ret;
 }
 
 - (NSArray *)selectedAssets
@@ -190,8 +205,6 @@ - (void)viewWillAppear:(BOOL)animated
     [AGIPCGridItem performSelector:@selector(resetNumberOfSelections)];
 
     [super viewWillAppear:animated];
-
-    [self.navigationController setToolbarHidden:[self toolbarHidden] animated:YES];
 }
 
 - (void)viewDidLoad
@@ -267,23 +280,27 @@ - (void)loadAssets
 {
     [self.assets removeAllObjects];
 
+    __block AGIPCAssetsController *blockSelf = self;
+
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
 
-        [self.assetsGroup enumerateAssetsUsingBlock:^(ALAsset *result, NSUInteger index, BOOL *stop) {
-
-            if (result == nil) 
-            {
-                return;
-            }
-
-            AGIPCGridItem *gridItem = [[AGIPCGridItem alloc] initWithAsset:result andDelegate:self];
-            [self.assets addObject:gridItem];
-            [gridItem release];
-        }];
+        @autoreleasepool {
+            [blockSelf.assetsGroup enumerateAssetsUsingBlock:^(ALAsset *result, NSUInteger index, BOOL *stop) {
+
+                if (result == nil) 
+                {
+                    return;
+                }
+
+                AGIPCGridItem *gridItem = [[AGIPCGridItem alloc] initWithAsset:result andDelegate:blockSelf];
+                [blockSelf.assets addObject:gridItem];
+                [gridItem release];
+            }];
+        }
 
         dispatch_async(dispatch_get_main_queue(), ^{
 
-            [self reloadData];
+            [blockSelf reloadData];
 
         });
 
@@ -292,6 +309,9 @@ - (void)loadAssets
 
 - (void)reloadData
 {
+    // Don't display the select button until all the assets are loaded.
+    [self.navigationController setToolbarHidden:[self toolbarHidden] animated:YES];
+
     [self.tableView reloadData];
     [self setTitle:[self.assetsGroup valueForProperty:ALAssetsGroupPropertyName]];
     [self changeSelectionInformation];
@@ -325,9 +345,13 @@ - (void)customBarButtonItemAction:(id)sender
         if (((AGIPCToolbarItem *)item).barButtonItem == sender)
         {
             if (((AGIPCToolbarItem *)item).assetIsSelectedBlock) {
-                [self.assets enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-                    ((AGIPCGridItem *)obj).selected = ((AGIPCToolbarItem *)item).assetIsSelectedBlock(idx, ((AGIPCGridItem *)obj).asset);
-                }];
+
+                NSUInteger idx = 0;
+                for (AGIPCGridItem *obj in self.assets) {
+                    obj.selected = ((AGIPCToolbarItem *)item).assetIsSelectedBlock(idx, ((AGIPCGridItem *)obj).asset);
+                    idx++;
+                }
+
             }
         }
     }

AGImagePickerController/AGIPCGridCell.h

@@ -18,6 +18,6 @@
 
 - (id)initWithItems:(NSArray *)theItems reuseIdentifier:(NSString *)theIdentifier;
 
-@property (nonatomic, retain) NSArray *items;
+@property (retain) NSArray *items;
 
 @end

AGImagePickerController/AGIPCGridCell.m

@@ -23,18 +23,33 @@ @implementation AGIPCGridCell
 
 - (void)setItems:(NSArray *)theItems
 {
-    if (items != theItems)
+    @synchronized (self)
     {
-        for (UIView *view in [self subviews]) 
-        {		
-            [view removeFromSuperview];
+        if (items != theItems)
+        {
+            for (UIView *view in [self subviews]) 
+            {		
+                [view removeFromSuperview];
+            }
+
+            [items release];
+            items = [theItems retain];
         }
-
-        [items release];
-        items = [theItems retain];
     }
 }
 
+- (NSArray *)items
+{
+    NSArray *array = nil;
+
+    @synchronized (self)
+    {
+        array = [[items retain] autorelease];
+    }
+
+    return array;
+}
+
 #pragma mark - Object Lifecycle
 
 - (void)dealloc

AGImagePickerController/AGIPCGridItem.h

@@ -38,8 +38,8 @@
     id<AGIPCGridItemDelegate> delegate;
 }
 
-@property (nonatomic, assign) BOOL selected;
-@property (nonatomic, retain) ALAsset *asset;
+@property (assign) BOOL selected;
+@property (retain) ALAsset *asset;
 
 @property (nonatomic, assign) id<AGIPCGridItemDelegate> delegate;
 

AGImagePickerController/AGIPCGridItem.m

@@ -31,53 +31,87 @@ @implementation AGIPCGridItem
 
 - (void)setSelected:(BOOL)isSelected
 {
-    if (selected != isSelected)
+    @synchronized (self)
     {
-        if (isSelected) {
-            // Check if we can select
-            if ([self.delegate respondsToSelector:@selector(agGridItemCanSelect:)])
+        if (selected != isSelected)
+        {
+            if (isSelected) {
+                // Check if we can select
+                if ([self.delegate respondsToSelector:@selector(agGridItemCanSelect:)])
+                {
+                    if (![self.delegate agGridItemCanSelect:self])
+                        return;
+                }
+            }
+
+            selected = isSelected;
+
+            self.selectionView.hidden = !selected;
+            self.checkmarkImageView.hidden = !selected;
+
+            if (selected)
             {
-                if (![self.delegate agGridItemCanSelect:self])
-                    return;
+                numberOfSelectedGridItems++;
             }
+            else
+            {
+                if (numberOfSelectedGridItems > 0)
+                    numberOfSelectedGridItems--;
+            }
+
+            dispatch_async(dispatch_get_main_queue(), ^{
+
+                if ([self.delegate respondsToSelector:@selector(agGridItem:didChangeSelectionState:)])
+                {
+                    [self.delegate performSelector:@selector(agGridItem:didChangeSelectionState:) withObject:self withObject:[NSNumber numberWithBool:selected]];
+                }
+
+                if ([self.delegate respondsToSelector:@selector(agGridItem:didChangeNumberOfSelections:)])
+                {
+                    [self.delegate performSelector:@selector(agGridItem:didChangeNumberOfSelections:) withObject:self withObject:[NSNumber numberWithUnsignedInteger:numberOfSelectedGridItems]];
+                }
+
+            });
         }
-
-        selected = isSelected;
-
-        self.selectionView.hidden = !selected;
-        self.checkmarkImageView.hidden = !selected;
-
-        if (selected)
-        {
-            numberOfSelectedGridItems++;
-        }
-        else
-        {
-            if (numberOfSelectedGridItems > 0)
-                numberOfSelectedGridItems--;
-        }
-
-        if ([self.delegate respondsToSelector:@selector(agGridItem:didChangeSelectionState:)])
-        {
-            [self.delegate performSelector:@selector(agGridItem:didChangeSelectionState:) withObject:self withObject:[NSNumber numberWithBool:selected]];
-        }
-
-        if ([self.delegate respondsToSelector:@selector(agGridItem:didChangeNumberOfSelections:)])
+    }
+}
+
+- (BOOL)selected
+{
+    BOOL ret;
+
+    @synchronized (self)
+    {
+        ret = selected;
+    }
+
+    return ret;
+}
+
+- (void)setAsset:(ALAsset *)theAsset
+{
+    @synchronized (self)
+    {
+        if (asset != theAsset)
         {
-            [self.delegate performSelector:@selector(agGridItem:didChangeNumberOfSelections:) withObject:self withObject:[NSNumber numberWithUnsignedInteger:numberOfSelectedGridItems]];
+            [asset release];
+            asset = [theAsset retain];
+
+            self.thumbnailImageView.image = [UIImage imageWithCGImage:asset.thumbnail];
         }
     }
 }
 
-- (void)setAsset:(ALAsset *)theAsset
+- (ALAsset *)asset
 {
-    if (asset != theAsset)
+    ALAsset *ret = nil;
+
+    @synchronized (self)
     {
-        [asset release];
-        asset = [theAsset retain];
-
-        self.thumbnailImageView.image = [UIImage imageWithCGImage:asset.thumbnail];
+        ret = [[asset retain] autorelease];
     }
+
+    return ret;
 }
 
 #pragma mark - Object Lifecycle

AGImagePickerController/AGImagePickerController.h

@@ -41,8 +41,8 @@ typedef void (^AGIPCDidFail)(NSError *error);
     NSArray *toolbarItemsForSelection;
 }
 
-@property (nonatomic, assign) BOOL shouldChangeStatusBarStyle;
-@property (nonatomic, assign) BOOL shouldDisplaySelectionInformation;
+@property (assign) BOOL shouldChangeStatusBarStyle;
+@property (assign) BOOL shouldDisplaySelectionInformation;
 @property NSUInteger maximumNumberOfPhotos;
 
 @property (nonatomic, assign) id delegate;

AGImagePickerController/AGImagePickerController.m

@@ -37,18 +37,33 @@ @implementation AGImagePickerController
 
 - (void)setShouldChangeStatusBarStyle:(BOOL)theShouldChangeStatusBarStyle
 {
-    if (shouldChangeStatusBarStyle != theShouldChangeStatusBarStyle)
+    @synchronized (self)
     {
-        shouldChangeStatusBarStyle = theShouldChangeStatusBarStyle;
-
-        if (shouldChangeStatusBarStyle)
-            if (IS_IPAD())
-                [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque animated:YES];
+        if (shouldChangeStatusBarStyle != theShouldChangeStatusBarStyle)
+        {
+            shouldChangeStatusBarStyle = theShouldChangeStatusBarStyle;
+
+            if (shouldChangeStatusBarStyle)
+                if (IS_IPAD())
+                    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackOpaque animated:YES];
+                else
+                    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackTranslucent animated:YES];
             else
-                [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleBlackTranslucent animated:YES];
-        else
-            [[UIApplication sharedApplication] setStatusBarStyle:oldStatusBarStyle animated:YES];
+                [[UIApplication sharedApplication] setStatusBarStyle:oldStatusBarStyle animated:YES];
+        }
+    }
+}
+
+- (BOOL)shouldChangeStatusBarStyle
+{
+    BOOL should;
+
+    @synchronized (self)
+    {
+        should = shouldChangeStatusBarStyle;
     }
+
+    return should;
 }
 
 + (ALAssetsLibrary *)defaultAssetsLibrary