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

Cleaned up broken specs for iOS.

Browse Source
This commit is contained in:
Blake Watters
2011-11-22 16:24:22 -05:00
parent 5b718890ac
commit f5008ff9fe
58 changed files with 2424 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Code/Network/RKRequestQueue.m
View File

@@ -195,7 +195,7 @@ static const NSTimeInterval kFlushDelay = 0.3;
#if TARGET_OS_IPHONE
if (self.showsNetworkActivityIndicatorWhenBusy) {
[[UIApplication sharedApplication] rk_pushNetworkActivity];
[[UIApplication sharedApplication] pushNetworkActivity];
}
#endif
} else if (_loadingCount > 0 && count == 0) {
@@ -208,7 +208,7 @@ static const NSTimeInterval kFlushDelay = 0.3;
#if TARGET_OS_IPHONE
if (self.showsNetworkActivityIndicatorWhenBusy) {
[[UIApplication sharedApplication] rk_popNetworkActivity];
[[UIApplication sharedApplication] popNetworkActivity];
}
#endif
}
@@ -490,48 +490,48 @@ static const NSTimeInterval kFlushDelay = 0.3;
@implementation UIApplication (RKNetworkActivity)
static NSInteger rk_networkActivityCount;
static NSInteger networkActivityCount;
- (NSInteger)rk_networkActivityCount {
- (NSInteger)networkActivityCount {
@synchronized(self) {
return rk_networkActivityCount;
return networkActivityCount;
}
}
- (void)rk_refreshActivityIndicator {
- (void)refreshActivityIndicator {
if(![NSThread isMainThread]) {
SEL sel_refresh = @selector(rk_refreshActivityIndicator);
SEL sel_refresh = @selector(refreshActivityIndicator);
[self performSelectorOnMainThread:sel_refresh withObject:nil waitUntilDone:NO];
return;
}
BOOL active = (self.rk_networkActivityCount > 0);
BOOL active = (self.networkActivityCount > 0);
self.networkActivityIndicatorVisible = active;
}
- (void)rk_pushNetworkActivity {
- (void)pushNetworkActivity {
@synchronized(self) {
rk_networkActivityCount++;
networkActivityCount++;
}
[self rk_refreshActivityIndicator];
[self refreshActivityIndicator];
}
- (void)rk_popNetworkActivity {
- (void)popNetworkActivity {
@synchronized(self) {
if (rk_networkActivityCount > 0) {
rk_networkActivityCount--;
if (networkActivityCount > 0) {
networkActivityCount--;
} else {
rk_networkActivityCount = 0;
networkActivityCount = 0;
RKLogError(@"Unbalanced network activity: count already 0.");
}
}
[self rk_refreshActivityIndicator];
[self refreshActivityIndicator];
}
- (void)rk_resetNetworkActivity {
- (void)resetNetworkActivity {
@synchronized(self) {
rk_networkActivityCount = 0;
networkActivityCount = 0;
}
[self rk_refreshActivityIndicator];
[self refreshActivityIndicator];
}
@end