From c3db232a5ecc120c06f1f89ceaa8dea79e468b9a Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Wed, 8 May 2013 10:23:40 -0700 Subject: [PATCH] [Issue #970] Refactoring network reachability to be more conventional (/thanks @djmadcat) --- AFNetworking/AFHTTPClient.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 98522ea..9a33557 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -330,12 +330,12 @@ static void AFNetworkReachabilityCallback(SCNetworkReachabilityRef __unused targ } static const void * AFNetworkReachabilityRetainCallback(const void *info) { - return (__bridge_retained const void *)([(__bridge AFNetworkReachabilityStatusBlock)info copy]); + return Block_copy(info); } static void AFNetworkReachabilityReleaseCallback(const void *info) { if (info) { - CFRelease(info); + Block_release(info); } } @@ -382,8 +382,9 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) { } - (void)stopMonitoringNetworkReachability { - if (_networkReachability) { - SCNetworkReachabilityUnscheduleFromRunLoop(_networkReachability, CFRunLoopGetMain(), (CFStringRef)NSRunLoopCommonModes); + if (self.networkReachability) { + SCNetworkReachabilityUnscheduleFromRunLoop(self.networkReachability, CFRunLoopGetMain(), (CFStringRef)NSRunLoopCommonModes); + CFRelease(_networkReachability); _networkReachability = NULL; }