Stop flickering in iOS network activity indicator by introducing a small delay before hiding it

Based on an idea from Jesse Rusak -> http://github.com/MindSea/asi-http-request/commit/f346f7f9de333501f732404323e8f73e911fbeea

@@ -725,9 +725,15 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
 #pragma mark network activity
 #pragma mark network activity
 
 
 + (BOOL)isNetworkInUse;
 + (BOOL)isNetworkInUse;
-#if TARGET_OS_IPHONE
+
 + (void)setShouldUpdateNetworkActivityIndicator:(BOOL)shouldUpdate;
 + (void)setShouldUpdateNetworkActivityIndicator:(BOOL)shouldUpdate;
-#endif
+
+// Shows the network activity spinner thing on iOS. You may wish to override this to do something else in Mac projects
++ (void)showNetworkActivityIndicator;
+
+// Hides the network activity spinner thing on iOS
++ (void)hideNetworkActivityIndicator;
+
 
 
 #pragma mark miscellany
 #pragma mark miscellany
 
 

@@ -23,7 +23,7 @@
 
 
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.7-42 2010-08-18";
+NSString *ASIHTTPRequestVersion = @"v1.7-53 2010-08-18";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
@@ -130,10 +130,12 @@ static id <ASICacheDelegate> defaultCache = nil;
 // Used for tracking when requests are using the network
 // Used for tracking when requests are using the network
 static unsigned int runningRequestCount = 0;
 static unsigned int runningRequestCount = 0;
 
 
-#if TARGET_OS_IPHONE
-// Use [ASIHTTPRequest setShouldUpdateNetworkActivityIndicator:NO] if you want to manage it yourself
+
+// You can use [ASIHTTPRequest setShouldUpdateNetworkActivityIndicator:NO] if you want to manage it yourself
+// Alternatively, override showNetworkActivityIndicator / hideNetworkActivityIndicator
+// By default this does nothing on Mac OS X, but again override the above methods for a different behaviour
 static BOOL shouldUpdateNetworkActivityIndicator = YES;
 static BOOL shouldUpdateNetworkActivityIndicator = YES;
-#endif
+
 
 
 //**Queue stuff**/
 //**Queue stuff**/
 
 
@@ -2990,11 +2992,12 @@ static NSOperationQueue *sharedQueue = nil;
 
 
 		if ([self readStreamIsScheduled]) {
 		if ([self readStreamIsScheduled]) {
 			runningRequestCount--;
 			runningRequestCount--;
-			#if TARGET_OS_IPHONE
 			if (shouldUpdateNetworkActivityIndicator && runningRequestCount == 0) {
 			if (shouldUpdateNetworkActivityIndicator && runningRequestCount == 0) {
-				[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+				// Wait half a second before turning off the indicator
+				// This can prevent flicker when you have a single request finish and then immediately start another request
+				// We will cancel hiding the activity indicator if we start again
+				[[self class] performSelector:@selector(hideNetworkActivityIndicator) withObject:nil afterDelay:0.5];
 			}
 			}
-			#endif
 		}
 		}
 
 
 		[self setReadStreamIsScheduled:NO];
 		[self setReadStreamIsScheduled:NO];
@@ -3014,11 +3017,10 @@ static NSOperationQueue *sharedQueue = nil;
 
 
 		[connectionsLock lock];
 		[connectionsLock lock];
 		runningRequestCount++;
 		runningRequestCount++;
-		#if TARGET_OS_IPHONE
 		if (shouldUpdateNetworkActivityIndicator) {
 		if (shouldUpdateNetworkActivityIndicator) {
-			[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
+			[NSObject cancelPreviousPerformRequestsWithTarget:[self class] selector:@selector(hideNetworkActivityIndicator) object:nil];
+			[[self class] showNetworkActivityIndicator];
 		}
 		}
-		#endif
 		[connectionsLock unlock];
 		[connectionsLock unlock];
 
 
 		// Reset the timeout
 		// Reset the timeout
@@ -3028,17 +3030,19 @@ static NSOperationQueue *sharedQueue = nil;
 	}
 	}
 }
 }
 
 
+
 - (void)unscheduleReadStream
 - (void)unscheduleReadStream
 {
 {
 	if ([self readStream] && [self readStreamIsScheduled]) {
 	if ([self readStream] && [self readStreamIsScheduled]) {
 
 
 		[connectionsLock lock];
 		[connectionsLock lock];
 		runningRequestCount--;
 		runningRequestCount--;
-		#if TARGET_OS_IPHONE
 		if (shouldUpdateNetworkActivityIndicator && runningRequestCount == 0) {
 		if (shouldUpdateNetworkActivityIndicator && runningRequestCount == 0) {
-			[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+			// Wait half a second before turning off the indicator
+			// This can prevent flicker when you have a single request finish and then immediately start another request
+			// We will cancel hiding the activity indicator if we start again
+			[[self class] performSelector:@selector(hideNetworkActivityIndicator) withObject:nil afterDelay:0.5];
 		}
 		}
-		#endif
 		[connectionsLock unlock];
 		[connectionsLock unlock];
 
 
 		[[self readStream] removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:[self runLoopMode]];
 		[[self readStream] removeFromRunLoop:[NSRunLoop currentRunLoop] forMode:[self runLoopMode]];
@@ -3976,14 +3980,27 @@ static NSOperationQueue *sharedQueue = nil;
 	[connectionsLock unlock];
 	[connectionsLock unlock];
 	return inUse;
 	return inUse;
 }
 }
-#if TARGET_OS_IPHONE
+
 + (void)setShouldUpdateNetworkActivityIndicator:(BOOL)shouldUpdate
 + (void)setShouldUpdateNetworkActivityIndicator:(BOOL)shouldUpdate
 {
 {
 	[connectionsLock lock];
 	[connectionsLock lock];
 	shouldUpdateNetworkActivityIndicator = shouldUpdate;
 	shouldUpdateNetworkActivityIndicator = shouldUpdate;
 	[connectionsLock unlock];
 	[connectionsLock unlock];
 }
 }
+
++ (void)showNetworkActivityIndicator
+{
+#if TARGET_OS_IPHONE
+	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
 #endif
 #endif
+}
+
++ (void)hideNetworkActivityIndicator
+{
+#if TARGET_OS_IPHONE
+	[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];	
+#endif
+}
 
 
 
 
 #pragma mark threading behaviour
 #pragma mark threading behaviour