Changed AFReachabilityStatus naming scheme to be more clear

This commit is contained in:
Kevin Harwood 2012-03-05 16:21:45 -06:00
parent 5b49cbbc86
commit 346c56b8f4
2 changed files with 8 additions and 8 deletions

View file

@ -43,9 +43,9 @@ extern NSString * const AFNetworkingReachabilityDidChangeNotification;
#ifdef _SYSTEMCONFIGURATION_H #ifdef _SYSTEMCONFIGURATION_H
typedef enum{ typedef enum{
AFReachabilityStatusUnknown = 0, AFReachabilityStatusUnknown = 0,
AFReachabilityStatusUnavilable, AFReachabilityStatusNotReachable,
AFReachabilityStatusAvailableViaWWAN, AFReachabilityStatusReachableViaWWAN,
AFReachabilityStatusAvailableViaWiFi, AFReachabilityStatusReachableViaWiFi,
}AFReachabilityStatus; }AFReachabilityStatus;
#endif #endif

View file

@ -248,20 +248,20 @@ static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCN
BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0); BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0);
BOOL isNetworkReachable = (isReachable && !needsConnection); BOOL isNetworkReachable = (isReachable && !needsConnection);
AFReachabilityStatus status = AFReachabilityStatusUnavilable; AFReachabilityStatus status = AFReachabilityStatusUnknown;
if(isNetworkReachable == NO){ if(isNetworkReachable == NO){
status = AFReachabilityStatusUnavilable; status = AFReachabilityStatusNotReachable;
} }
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
else if((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0){ else if((flags & kSCNetworkReachabilityFlagsIsWWAN) != 0){
status = AFReachabilityStatusAvailableViaWWAN; status = AFReachabilityStatusReachableViaWWAN;
} }
else{ else{
status = AFReachabilityStatusAvailableViaWiFi; status = AFReachabilityStatusReachableViaWiFi;
} }
#else #else
else { else {
status = AFReachabilityStatusAvailableViaWiFi; status = AFReachabilityStatusReachableViaWiFi;
} }
#endif #endif
AFNetworkReachabilityStatusBlock block = (AFNetworkReachabilityStatusBlock)info; AFNetworkReachabilityStatusBlock block = (AFNetworkReachabilityStatusBlock)info;