setNetworkActivityIndicator is now set based on the number of ongoing…

… *active* requests, not the operation queue's count.
xxdd · Aug 6, 2012 · 67a98b2 · 67a98b2
1 parent 15c239c
commit 67a98b2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/SVHTTPRequest/SVHTTPClient.h b/SVHTTPRequest/SVHTTPClient.h
@@ -37,5 +37,6 @@
 
 @property (nonatomic, readwrite) BOOL sendParametersAsJSON;
 @property (nonatomic, readwrite) NSURLRequestCachePolicy cachePolicy;
+@property (nonatomic, readwrite) NSUInteger activeRequestCount;
 
 @end
diff --git a/SVHTTPRequest/SVHTTPClient.m b/SVHTTPRequest/SVHTTPClient.m
@@ -28,7 +28,7 @@ - (void)queueRequest:(NSString*)path
 
 @implementation SVHTTPClient
 
-@synthesize username, password, basePath, userAgent, sendParametersAsJSON, cachePolicy, operationQueue, HTTPHeaderFields;
+@synthesize username, password, basePath, userAgent, sendParametersAsJSON, cachePolicy, operationQueue, HTTPHeaderFields, activeRequestCount;
 
 
 + (id)sharedClient {
@@ -47,20 +47,20 @@ - (id)init {
     if (self = [super init]) {
         self.operationQueue = [[NSOperationQueue alloc] init];
 
-        [self.operationQueue addObserver:self
-                              forKeyPath:@"operationCount"
-                                 options:NSKeyValueObservingOptionNew
-                                 context:&self->operationQueue];
+        [self addObserver:self
+               forKeyPath:@"activeRequestCount"
+                  options:NSKeyValueObservingOptionNew
+                  context:nil];
     }
 
     return self;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-    if ([keyPath isEqualToString:@"operationCount"]) {
+    if ([keyPath isEqualToString:@"activeRequestCount"]) {
 #if TARGET_OS_IPHONE
         dispatch_async(dispatch_get_main_queue(), ^{
-            BOOL indicatorVisible = self.operationQueue.operationCount > 0;
+            BOOL indicatorVisible = activeRequestCount > 0;
             [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:indicatorVisible];
         });
 #endif
@@ -69,9 +69,8 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
         [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
 }
 
-- (void)dealloc
-{
-    [self.operationQueue removeObserver:self forKeyPath:@"operationCount" context:&self->operationQueue];
+- (void)dealloc {
+    [self removeObserver:self forKeyPath:@"activeRequestCount" context:nil];
 }
 
 #pragma mark - Setters
@@ -157,6 +156,8 @@ - (void)queueRequest:(NSString*)path
     requestOperation.cachePolicy = self.cachePolicy;
     requestOperation.userAgent = self.userAgent;
 
+    [(id<SVHTTPRequestPrivateMethods>)requestOperation setClient:self];
+
     [self.HTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *field, NSString *value, BOOL *stop) {
         [(id<SVHTTPRequestPrivateMethods>)requestOperation setValue:value forHTTPHeaderField:field];
     }];

diff --git a/SVHTTPRequest/SVHTTPRequest.h b/SVHTTPRequest/SVHTTPRequest.h
@@ -51,6 +51,7 @@ typedef NSUInteger SVHTTPRequestMethod;
 @protocol SVHTTPRequestPrivateMethods <NSObject>
 
 @property (nonatomic, strong) NSString *requestPath;
+@property (nonatomic, strong) SVHTTPClient *client;
 
 - (SVHTTPRequest*)initWithAddress:(NSString*)urlString 
                            method:(SVHTTPRequestMethod)method 
@@ -60,7 +61,6 @@ typedef NSUInteger SVHTTPRequestMethod;
                        completion:(void (^)(id, NSHTTPURLResponse*, NSError*))completionBlock;
 
 - (void)signRequestWithUsername:(NSString*)username password:(NSString*)password;
-
 - (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field;
 
 @end
diff --git a/SVHTTPRequest/SVHTTPRequest.m b/SVHTTPRequest/SVHTTPRequest.m
@@ -44,6 +44,7 @@ @interface SVHTTPRequest ()
 
 @property (nonatomic, readwrite) SVHTTPRequestState state;
 @property (nonatomic, strong) NSString *requestPath;
+@property (nonatomic, strong) SVHTTPClient *client;
 
 @property (nonatomic, strong) NSTimer *timeoutTimer; // see http://stackoverflow.com/questions/2736967
 
@@ -68,7 +69,7 @@ @implementation SVHTTPRequest
 @synthesize operationRequest, operationData, operationConnection, operationParameters, operationURLResponse, operationFileHandle, state;
 @synthesize operationSavePath, operationCompletionBlock, operationProgressBlock, timeoutTimer;
 @synthesize expectedContentLength, receivedContentLength, saveDataDispatchGroup, saveDataDispatchQueue;
-@synthesize requestPath, userAgent;
+@synthesize requestPath, userAgent, client;
 
 - (void)dealloc {
     [operationConnection cancel];
@@ -301,6 +302,7 @@ - (void)start {
         [self.operationConnection scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
 
     [self.operationConnection start];
+    self.client.activeRequestCount++;
 
 #if !(defined SVHTTPREQUEST_DISABLE_LOGGING)
     NSLog(@"[%@] %@", self.operationRequest.HTTPMethod, self.operationRequest.URL.absoluteString);
@@ -425,7 +427,8 @@ - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)err
 
 - (void)callCompletionBlockWithResponse:(id)response error:(NSError *)error {
     self.timeoutTimer = nil;
-
+    self.client.activeRequestCount--;
+
     dispatch_async(dispatch_get_main_queue(), ^{
         NSError *serverError = error;