From 346c56b8f4836fa26424e0ce7e825914c09c8ebb Mon Sep 17 00:00:00 2001 From: Kevin Harwood Date: Mon, 5 Mar 2012 16:21:45 -0600 Subject: [PATCH] Changed AFReachabilityStatus naming scheme to be more clear --- AFNetworking/AFHTTPClient.h | 6 +++--- AFNetworking/AFHTTPClient.m | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AFNetworking/AFHTTPClient.h b/AFNetworking/AFHTTPClient.h index 4f3a104..8438659 100644 --- a/AFNetworking/AFHTTPClient.h +++ b/AFNetworking/AFHTTPClient.h @@ -43,9 +43,9 @@ extern NSString * const AFNetworkingReachabilityDidChangeNotification; #ifdef _SYSTEMCONFIGURATION_H typedef enum{ AFReachabilityStatusUnknown = 0, - AFReachabilityStatusUnavilable, - AFReachabilityStatusAvailableViaWWAN, - AFReachabilityStatusAvailableViaWiFi, + AFReachabilityStatusNotReachable, + AFReachabilityStatusReachableViaWWAN, + AFReachabilityStatusReachableViaWiFi, }AFReachabilityStatus; #endif diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 689b9ec..ff24dfd 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -248,20 +248,20 @@ static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCN BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0); BOOL isNetworkReachable = (isReachable && !needsConnection); - AFReachabilityStatus status = AFReachabilityStatusUnavilable; + AFReachabilityStatus status = AFReachabilityStatusUnknown; if(isNetworkReachable == NO){ - status = AFReachabilityStatusUnavilable; + status = AFReachabilityStatusNotReachable; } #if TARGET_OS_IPHONE else if((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0){ - status = AFReachabilityStatusAvailableViaWWAN; + status = AFReachabilityStatusReachableViaWWAN; } else{ - status = AFReachabilityStatusAvailableViaWiFi; + status = AFReachabilityStatusReachableViaWiFi; } #else else { - status = AFReachabilityStatusAvailableViaWiFi; + status = AFReachabilityStatusReachableViaWiFi; } #endif AFNetworkReachabilityStatusBlock block = (AFNetworkReachabilityStatusBlock)info;