Merge pull request #6 from josipbernat/develop

Updated canceling operations.
josipbernat · Sep 2, 2014 · 8c078c5 · 8c078c5
2 parents 18e993b + 0398fb7
commit 8c078c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/JBMessage.podspec b/JBMessage.podspec
@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
   	s.name         		= "JBMessage"
- 	s.version      		= "1.0.12"
+ 	s.version      		= "1.0.13"
   	s.summary      		= "JBMessage is simple iOS networking wrapper based on AFNetworking"
   	s.homepage     		= "https://github.com/josipbernat/JBMessage"
   	s.license      		= { :type => "MIT", :file => "LICENSE" }
   	s.author            = { "Josip Bernat" => "[email protected]" }
   	s.social_media_url	= "http://twitter.com/josipbernat"
   	s.platform     		= :ios, "6.0"
-  	s.source       		= { :git => "https://github.com/josipbernat/JBMessage.git", :tag => "v1.0.12" }
+  	s.source       		= { :git => "https://github.com/josipbernat/JBMessage.git", :tag => "v1.0.13" }
   	s.source_files  	= 'JBMessage/JBMessage/**/*.{h,m}'
    	s.requires_arc 		= true
-	s.dependency 		"AFNetworking", "~> 2.3.1"
+	s.dependency 		"AFNetworking", "~> 2.3"
 end
 
diff --git a/JBMessage/JBMessage/JBMessage.m b/JBMessage/JBMessage/JBMessage.m
@@ -35,6 +35,8 @@ @interface JBMessage () {
     BOOL _isExecuting;
 }
 
+@property (nonatomic, strong) AFHTTPRequestOperation *operation;
+
 #pragma mark - Shared Queue
 + (NSOperationQueue *)sharedQueue;
 
@@ -224,7 +226,10 @@ - (void) finish {
 }
 
 - (void) cancel {
+
     _isCancelled = YES;
+    [self.operation cancel];
+    self.operation = nil;
 }
 
 - (BOOL) isConcurrent {
@@ -270,13 +275,16 @@ - (void)executeRequest {
 
                                                                              __strong JBMessage *strongThis = this;
                                                                              [strongThis receivedResponse:responseObject error:nil];
+                                                                             strongThis.operation = nil;
+
                                                                          } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
 #ifdef DEBUG
                                                                              NSString *response = [[NSString alloc] initWithData:operation.responseData encoding:NSUTF8StringEncoding];
                                                                              if (response && response.length) { NSLog(@"Response error: %@", response); }
 #endif
                                                                              __strong JBMessage *strongThis = this;
                                                                              [strongThis receivedResponse:operation.responseData error:error];
+                                                                             strongThis.operation = nil;
                                                                          }];
 
     [operation setUploadProgressBlock:self.uploadBlock];

diff --git a/Podfile b/Podfile
@@ -1,2 +1,2 @@
 platform :ios, '6.0'
-pod 'AFNetworking', '~> 2.3.1'
+pod 'AFNetworking', '~> 2.3'
diff --git a/Podfile.lock b/Podfile.lock
@@ -22,7 +22,7 @@ PODS:
     - AFNetworking/NSURLSession
 
 DEPENDENCIES:
-  - AFNetworking (~> 2.3.1)
+  - AFNetworking (~> 2.3)
 
 SPEC CHECKSUMS:
   AFNetworking: 6d7b76aa5d04c8c37daad3eef4b7e3f2a7620da3