Cancel url session task when http net task is canceled. Fixed #3.

Author: kevin-lyn

STNetTaskQueue/STHTTPNetTask.m

@@ -14,6 +14,12 @@
 NSString *const STHTTPNetTaskErrorResponseDataUserInfoKey = @"responseData";
 NSString *STHTTPNetTaskRequestObjectDefaultSeparator = @"_";
 
+@interface STHTTPNetTask ()
+
+@property (nonatomic, strong) NSURLSessionTask *sessionTask;
+
+@end
+
 @implementation STHTTPNetTask
 
 - (STHTTPNetTaskMethod)method

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

@@ -207,9 +207,22 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue handleTask:(STNetTask *)task
             break;
     }
 
+    [httpTask setValue:sessionTask forKey:@"sessionTask"];
     [sessionTask resume];
 }
 
+- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue didCancelTask:(STNetTask *)task
+{
+    NSAssert([task isKindOfClass:[STHTTPNetTask class]], @"Net task should be subclass of STHTTPNetTask");
+    
+    STHTTPNetTask *httpTask = (STHTTPNetTask *)task;
+    
+    NSURLSessionTask *sessionTask = [httpTask valueForKey:@"sessionTask"];
+    [sessionTask cancel];
+    
+    [httpTask setValue:nil forKey:@"sessionTask"];
+}
+
 - (NSString *)queryStringFromParameters:(NSDictionary *)parameters
 {
     if (!parameters.count) {

STNetTaskQueue/STNetTaskQueue.h

@@ -14,6 +14,7 @@
 @protocol STNetTaskQueueHandler <NSObject>
 
 - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue handleTask:(STNetTask *)task;
+- (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue didCancelTask:(STNetTask *)task;
 
 @end
 

STNetTaskQueue/STNetTaskQueue.m

@@ -97,6 +97,8 @@ - (void)_cancelTask:(STNetTask *)task
     [self.tasks removeObject:task];
     [self.watingTasks removeObject:task];
     task.pending = NO;
+    
+    [self.handler netTaskQueue:self didCancelTask:task];
 }
 
 - (BOOL)_retryTask:(STNetTask *)task withError:(NSError *)error

STNetTaskQueueTest/STNetTaskQueueTest/STNetTaskQueueTestHTTP.m

@@ -56,6 +56,24 @@ - (void)testRetryNetTask
     [self waitForExpectationsWithTimeout:10 handler:nil];
 }
 
+- (void)testCancelNetTask
+{
+    [self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];
+    
+    _expectation = [self expectationWithDescription:@"testRetryNetTask"];
+    
+    STTestRetryNetTask *testRetryTask = [STTestRetryNetTask new];
+    [[STNetTaskQueue sharedQueue] addTaskDelegate:self uri:testRetryTask.uri];
+    [[STNetTaskQueue sharedQueue] addTask:testRetryTask];
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [[STNetTaskQueue sharedQueue] cancelTask:testRetryTask];
+        [_expectation fulfill];
+    });
+
+    [self waitForExpectationsWithTimeout:10 handler:nil];
+}
+
 - (void)testGetNetTask
 {
     [self setUpNetTaskQueueWithBaseURLString:@"http://jsonplaceholder.typicode.com"];