Added thread-safety

Refactored core
Alterplay · Sep 21, 2015 · e516d2a · e516d2a
1 parent 9bda282
commit e516d2a
Show file tree

Hide file tree

Showing 33 changed files with 1,080 additions and 493 deletions.
diff --git a/Example/Objective-C/AddressBook.xcodeproj/project.pbxproj b/Example/Objective-C/AddressBook.xcodeproj/project.pbxproj
diff --git a/Example/Objective-C/AddressBook/ListViewController.h b/Example/Objective-C/AddressBook/ListViewController.h
@@ -9,11 +9,5 @@
 #import <UIKit/UIKit.h>
 #import "DTTableViewController.h"
 
-@class APAddressBook;
-
 @interface ListViewController : DTTableViewController
-{
-    APAddressBook *addressBook;
-}
-
 @end
diff --git a/Example/Objective-C/AddressBook/ListViewController.m b/Example/Objective-C/AddressBook/ListViewController.m
@@ -13,6 +13,7 @@
 
 @interface ListViewController ()
 @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activity;
+@property (nonatomic, strong) APAddressBook *addressBook;
 @end
 
 @implementation ListViewController
@@ -24,9 +25,10 @@ - (id)initWithCoder:(NSCoder *)aDecoder
     self = [super initWithCoder:aDecoder];
     if (self)
     {
-        addressBook = [[APAddressBook alloc] init];
+        self.addressBook = [[APAddressBook alloc] init];
         __weak typeof(self) weakSelf = self;
-        [addressBook startObserveChangesWithCallback:^{
+        [self.addressBook startObserveChangesWithCallback:^
+        {
             [weakSelf loadContacts];
         }];
     }
@@ -74,15 +76,15 @@ - (void)loadContacts
     [self.memoryStorage removeAllTableItems];
     [self.activity startAnimating];
     __weak __typeof(self) weakSelf = self;
-    addressBook.fieldsMask = APContactFieldAll;
-    addressBook.sortDescriptors = @[
+    self.addressBook.fieldsMask = APContactFieldAll;
+    self.addressBook.sortDescriptors = @[
      [NSSortDescriptor sortDescriptorWithKey:@"firstName" ascending:YES],
      [NSSortDescriptor sortDescriptorWithKey:@"lastName" ascending:YES]];
-    addressBook.filterBlock = ^BOOL(APContact *contact)
+    self.addressBook.filterBlock = ^BOOL(APContact *contact)
     {
         return contact.phones.count > 0;
     };
-    [addressBook loadContacts:^(NSArray *contacts, NSError *error)
+    [self.addressBook loadContacts:^(NSArray *contacts, NSError *error)
     {
         [weakSelf.activity stopAnimating];
         if (!error)
@@ -91,10 +93,8 @@ - (void)loadContacts
         }
         else
         {
-            UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
-                                                                message:error.localizedDescription
-                                                               delegate:nil
-                                                      cancelButtonTitle:@"OK"
+            UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil message:error.localizedDescription
+                                                               delegate:nil cancelButtonTitle:@"OK"
                                                       otherButtonTitles:nil];
             [alertView show];
         }

diff --git a/Pod/Core/APAddressBook.m b/Pod/Core/APAddressBook.m