kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-21 02:50:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reworked reachability initialization to support usage when there is no Internet connectivity.

Browse Source 
* When the reachabilityObserver property of RKClient is nil, assume we have reachability
* When the baseURL configured contains an IP address or localhost, use hostname based reachability
* Else fall through to using Internet reachability if the user has not configured an observer directly
This commit is contained in:
Blake Watters
2011-11-09 08:17:46 -05:00
parent dad00a4f6f
commit fd80eae643
4 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Code/Network/RKClient.m
View File

@@ -24,6 +24,7 @@
#import "../Support/RKAlert.h"
#import "../Support/RKLog.h"
#import "../Support/RKPathMatcher.h"
#import "../Support/NSString+RestKit.h"
// Set Logging Component
#undef RKLogComponent
@@ -128,7 +129,6 @@ NSString *RKPathAppendQueryParams(NSString *resourcePath, NSDictionary *queryPar
// Configure reachability and queue
[self addObserver:self forKeyPath:@"reachabilityObserver" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
self.reachabilityObserver = [RKReachabilityObserver reachabilityObserverForInternet];
self.requestQueue = [RKRequestQueue requestQueue];
[self addObserver:self forKeyPath:@"baseURL" options:NSKeyValueObservingOptionNew context:nil];
@@ -187,7 +187,7 @@ NSString *RKPathAppendQueryParams(NSString *resourcePath, NSDictionary *queryPar
}
- (BOOL)isNetworkReachable {
BOOL isNetworkReachable = NO;
BOOL isNetworkReachable = YES;
if (self.reachabilityObserver) {
isNetworkReachable = [self.reachabilityObserver isNetworkReachable];
}
@@ -277,14 +277,25 @@ NSString *RKPathAppendQueryParams(NSString *resourcePath, NSDictionary *queryPar
}
- (void)baseURLDidChange:(NSDictionary *)change {
NSString *newBaseURL = [change objectForKey:NSKeyValueChangeNewKey];
NSString *newBaseURLString = [change objectForKey:NSKeyValueChangeNewKey];
// Don't crash if baseURL is nil'd out (i.e. dealloc)
if (! [newBaseURL isEqual:[NSNull null]]) {
if (! [newBaseURLString isEqual:[NSNull null]]) {
// Configure a cache for the new base URL
[_requestCache release];
_requestCache = [[RKRequestCache alloc] initWithCachePath:[self cachePath]
storagePolicy:RKRequestCacheStoragePolicyPermanently];
// Determine reachability strategy (if user has not already done so)
if (self.reachabilityObserver == nil) {
NSURL *newBaseURL = [NSURL URLWithString:newBaseURLString];
NSString *hostName = [newBaseURL host];
if ([newBaseURLString isEqualToString:@"localhost"] || [hostName isIPAddress]) {
self.reachabilityObserver = [RKReachabilityObserver reachabilityObserverForHost:hostName];
} else {
self.reachabilityObserver = [RKReachabilityObserver reachabilityObserverForInternet];
}
}
}
}