evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replacing AFNetworkReachabilityStatus type with BOOL

Browse source
This commit is contained in:
Mattt Thompson 2012-01-10 13:17:27 -08:00
parent 95442be7b3
commit c713179420
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
AFNetworking/AFHTTPClient.h
View file

@ -35,13 +35,6 @@ typedef enum {
AFPropertyListParameterEncoding, AFPropertyListParameterEncoding,
} AFHTTPClientParameterEncoding; } AFHTTPClientParameterEncoding;
/**
*/
typedef enum {
AFNetworkNotReachable,
AFNetworkReachable,
} AFNetworkReachabilityStatus;
/** /**
Returns a string, replacing certain characters with the equivalent percent escape sequence based on the specified encoding. 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 /// @name Managing HTTP Operations

15
AFNetworking/AFHTTPClient.m
View file

@ -50,15 +50,7 @@ static NSString * const kAFMultipartFormBoundary = @"Boundary+0xAbCdEfGbOuNdArY"
#pragma mark - #pragma mark -
typedef void (^AFNetworkReachabilityStatusBlock)(AFNetworkReachabilityStatus reachabilityStatus); typedef void (^AFNetworkReachabilityStatusBlock)(BOOL isNetworkReachable);
static AFNetworkReachabilityStatus AFNetworkReachabilityStatusFromFlags(SCNetworkReachabilityFlags flags) {
if ((flags & kSCNetworkReachabilityFlagsReachable) == 0) {
return AFNetworkNotReachable;
} else {
return AFNetworkReachable;
}
}
static NSUInteger const kAFHTTPClientDefaultMaxConcurrentOperationCount = 4; static NSUInteger const kAFHTTPClientDefaultMaxConcurrentOperationCount = 4;
@ -206,11 +198,12 @@ static NSString * AFPropertyListStringFromParameters(NSDictionary *parameters) {
static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNetworkReachabilityFlags flags, void *info) { static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNetworkReachabilityFlags flags, void *info) {
if (info) { if (info) {
AFNetworkReachabilityStatusBlock block = (AFNetworkReachabilityStatusBlock)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) { if (_networkReachability) {
SCNetworkReachabilityUnscheduleFromRunLoop(_networkReachability, CFRunLoopGetMain(), (CFStringRef)NSRunLoopCommonModes); SCNetworkReachabilityUnscheduleFromRunLoop(_networkReachability, CFRunLoopGetMain(), (CFStringRef)NSRunLoopCommonModes);
CFRelease(_networkReachability); CFRelease(_networkReachability);