|
@@ -305,10 +305,8 @@ static BOOL AFURLHostIsIPAddress(NSURL *url) {
|
|
static AFNetworkReachabilityStatus AFNetworkReachabilityStatusForFlags(SCNetworkReachabilityFlags flags) {
|
|
static AFNetworkReachabilityStatus AFNetworkReachabilityStatusForFlags(SCNetworkReachabilityFlags flags) {
|
|
BOOL isReachable = ((flags & kSCNetworkReachabilityFlagsReachable) != 0);
|
|
BOOL isReachable = ((flags & kSCNetworkReachabilityFlagsReachable) != 0);
|
|
BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0);
|
|
BOOL needsConnection = ((flags & kSCNetworkReachabilityFlagsConnectionRequired) != 0);
|
|
- BOOL canConnectionAutomatically = (((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) ||
|
|
|
|
- ((flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0));
|
|
|
|
- BOOL canConnectWithoutUserInteraction = (canConnectionAutomatically &&
|
|
|
|
- (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0);
|
|
|
|
|
|
+ BOOL canConnectionAutomatically = (((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) || ((flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0));
|
|
|
|
+ BOOL canConnectWithoutUserInteraction = (canConnectionAutomatically && (flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0);
|
|
BOOL isNetworkReachable = (isReachable && (!needsConnection || canConnectWithoutUserInteraction));
|
|
BOOL isNetworkReachable = (isReachable && (!needsConnection || canConnectWithoutUserInteraction));
|
|
|
|
|
|
AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusUnknown;
|
|
AFNetworkReachabilityStatus status = AFNetworkReachabilityStatusUnknown;
|