Revert "Removing AFNetworkReachabilityAssociation and networkReachabi…

…lityAssociation property" This reverts commit 99894d4. Conflicts: AFNetworking/AFNetworkReachabilityManager.m
jianpx · Apr 3, 2015 · e92af05 · e92af05
1 parent a13a244
commit e92af05
Showing 1 changed file with 31 additions and 12 deletions.
diff --git a/AFNetworking/AFNetworkReachabilityManager.m b/AFNetworking/AFNetworkReachabilityManager.m
@@ -33,6 +33,12 @@
 
 typedef void (^AFNetworkReachabilityStatusBlock)(AFNetworkReachabilityStatus status);
 
+typedef NS_ENUM(NSUInteger, AFNetworkReachabilityAssociation) {
+    AFNetworkReachabilityForAddress = 1,
+    AFNetworkReachabilityForAddressPair = 2,
+    AFNetworkReachabilityForName = 3,
+};
+
 NSString * AFStringFromNetworkReachabilityStatus(AFNetworkReachabilityStatus status) {
     switch (status) {
         case AFNetworkReachabilityStatusNotReachable:
@@ -98,6 +104,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) {
 
 @interface AFNetworkReachabilityManager ()
 @property (readwrite, nonatomic, assign) SCNetworkReachabilityRef networkReachability;
+@property (readwrite, nonatomic, assign) AFNetworkReachabilityAssociation networkReachabilityAssociation;
 @property (readwrite, nonatomic, assign) AFNetworkReachabilityStatus networkReachabilityStatus;
 @property (readwrite, nonatomic, copy) AFNetworkReachabilityStatusBlock networkReachabilityStatusBlock;
 @end
@@ -123,6 +130,7 @@ + (instancetype)managerForDomain:(NSString *)domain {
     SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, [domain UTF8String]);
 
     AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
+    manager.networkReachabilityAssociation = AFNetworkReachabilityForName;
 
     return manager;
 }
@@ -131,6 +139,7 @@ + (instancetype)managerForAddress:(const void *)address {
     SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr *)address);
 
     AFNetworkReachabilityManager *manager = [[self alloc] initWithReachability:reachability];
+    manager.networkReachabilityAssociation = AFNetworkReachabilityForAddress;
 
     return manager;
 }
@@ -194,18 +203,28 @@ - (void)startMonitoring {
     SCNetworkReachabilitySetCallback(self.networkReachability, AFNetworkReachabilityCallback, &context);
     SCNetworkReachabilityScheduleWithRunLoop(self.networkReachability, CFRunLoopGetMain(), kCFRunLoopCommonModes);
 
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0),^{
-        SCNetworkReachabilityFlags flags;
-        SCNetworkReachabilityGetFlags(self.networkReachability, &flags);
-        AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusForFlags(flags);
-        dispatch_async(dispatch_get_main_queue(), ^{
-            callback(status);
-
-            NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-            NSDictionary *userInfo = @{ AFNetworkingReachabilityNotificationStatusItem: @(status) };
-            [notificationCenter postNotificationName:AFNetworkingReachabilityDidChangeNotification object:nil userInfo:userInfo];
-        });
-    });
+    switch (self.networkReachabilityAssociation) {
+        case AFNetworkReachabilityForName:
+            break;
+        case AFNetworkReachabilityForAddress:
+        case AFNetworkReachabilityForAddressPair:
+        default: {
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0),^{
+                SCNetworkReachabilityFlags flags;
+                SCNetworkReachabilityGetFlags(self.networkReachability, &flags);
+                AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusForFlags(flags);
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    callback(status);
+
+                    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+                    [notificationCenter postNotificationName:AFNetworkingReachabilityDidChangeNotification object:nil userInfo:@{ AFNetworkingReachabilityNotificationStatusItem: @(status) }];
+
+
+                });
+            });
+        }
+            break;
+    }
 }
 
 - (void)stopMonitoring {