- fixed a bug where the task was not cancelled and the downloaded ima…

…ge in a list was set more then once.
lucianboboc · Sep 15, 2015 · 6f2eb04 · 6f2eb04
1 parent 0c94f3e
commit 6f2eb04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/LBCache.podspec b/LBCache.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LBCache"
-  s.version      = "1.0.5"
+  s.version      = "1.0.6"
   s.summary      = "LBCache image cache framework"
   s.description  = <<-DESC
                    LBCache is an asynchronous image cache framework for iOS.

diff --git a/LBCache/ImageOperation.m b/LBCache/ImageOperation.m
@@ -17,6 +17,7 @@ @interface ImageOperation () <NSURLSessionDataDelegate, NSURLSessionTaskDelegate
 @property (copy, nonatomic) ProgressBlock progressBlock;
 @property (strong, nonatomic) NSURL *location;
 @property (nonatomic) LBCacheImageOptions options;
+@property (strong, nonatomic) NSURLSessionDownloadTask *task;
 
 @property (assign, nonatomic, getter = isExecuting) BOOL executing;
 @property (assign, nonatomic, getter = isFinished) BOOL finished;
@@ -68,10 +69,22 @@ - (void) done
 }
 
 
+- (void) cancel {
+    [super cancel];
+
+    [self cancelTask];
+}
+
+- (void) cancelTask {
+    [self.task cancel];
+}
+
+
 - (void) start
 {
     if(self.isCancelled)
     {
+        [self cancelTask];
         [self done];
         return;
     }
@@ -136,8 +149,8 @@ -(void) getImageFromTheServer {
 
     [[NSNotificationCenter defaultCenter] postNotificationName:LBCacheDownloadImageStartedNotification object:self];
 
-    NSURLSessionDownloadTask *task = [self.sesstion downloadTaskWithRequest: request];
-    [task resume];
+    self.task = [self.sesstion downloadTaskWithRequest: request];
+    [self.task resume];
 }
 
 -(void) loadOnlyFromCache

diff --git a/LBCache2-Demo.xcodeproj/project.pbxproj b/LBCache2-Demo.xcodeproj/project.pbxproj
@@ -187,7 +187,6 @@
 			children = (
 				25C65F44175D39F100AE8FFC /* AppDelegate.h */,
 				25C65F45175D39F100AE8FFC /* AppDelegate.m */,
-				67F123B61844ECF6008F01BD /* LBCache */,
 				25C65F4D175D39F100AE8FFC /* MainStoryboard.storyboard */,
 				25C65F50175D39F100AE8FFC /* ViewController.h */,
 				25C65F51175D39F100AE8FFC /* ViewController.m */,
@@ -257,13 +256,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		67F123B61844ECF6008F01BD /* LBCache */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = LBCache;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */