diff --git a/AFNetworking/AFHTTPClient.h b/AFNetworking/AFHTTPClient.h index 13c4782..e5a1650 100644 --- a/AFNetworking/AFHTTPClient.h +++ b/AFNetworking/AFHTTPClient.h @@ -35,13 +35,6 @@ typedef enum { AFPropertyListParameterEncoding, } AFHTTPClientParameterEncoding; -/** - */ -typedef enum { - AFNetworkNotReachable, - AFNetworkReachable, -} AFNetworkReachabilityStatus; - /** Returns a string, replacing certain characters with the equivalent percent escape sequence based on the specified encoding. @@ -170,7 +163,7 @@ extern NSString * AFQueryStringFromParametersWithEncoding(NSDictionary *paramete /** */ -- (void)setReachabilityStatusChangeBlock:(void (^)(AFNetworkReachabilityStatus reachabilityStatus))block; +- (void)setReachabilityStatusChangeBlock:(void (^)(BOOL isNetworkReachable))block; ///------------------------------- /// @name Managing HTTP Operations diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 768fa50..b101882 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -50,15 +50,7 @@ static NSString * const kAFMultipartFormBoundary = @"Boundary+0xAbCdEfGbOuNdArY" #pragma mark - -typedef void (^AFNetworkReachabilityStatusBlock)(AFNetworkReachabilityStatus reachabilityStatus); - -static AFNetworkReachabilityStatus AFNetworkReachabilityStatusFromFlags(SCNetworkReachabilityFlags flags) { - if ((flags & kSCNetworkReachabilityFlagsReachable) == 0) { - return AFNetworkNotReachable; - } else { - return AFNetworkReachable; - } -} +typedef void (^AFNetworkReachabilityStatusBlock)(BOOL isNetworkReachable); static NSUInteger const kAFHTTPClientDefaultMaxConcurrentOperationCount = 4; @@ -206,11 +198,12 @@ static NSString * AFPropertyListStringFromParameters(NSDictionary *parameters) { static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNetworkReachabilityFlags flags, void *info) { if (info) { AFNetworkReachabilityStatusBlock block = (AFNetworkReachabilityStatusBlock)info; - block(AFNetworkReachabilityStatusFromFlags(flags)); + BOOL isNetworkReachable = (flags & kSCNetworkReachabilityFlagsReachable); + block(isNetworkReachable); } } -- (void)setReachabilityStatusChangeBlock:(void (^)(AFNetworkReachabilityStatus reachabilityStatus))block { +- (void)setReachabilityStatusChangeBlock:(void (^)(BOOL isNetworkReachable))block { if (_networkReachability) { SCNetworkReachabilityUnscheduleFromRunLoop(_networkReachability, CFRunLoopGetMain(), (CFStringRef)NSRunLoopCommonModes); CFRelease(_networkReachability);