- Add cancel operation

codedswitch · Jul 23, 2017 · 42693aa · 42693aa
1 parent bc3fb4e
commit 42693aa
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/CSFramework.podspec b/CSFramework.podspec
@@ -8,8 +8,8 @@
 
 Pod::Spec.new do |s|
   s.name             = 'CSFramework'
-  s.version          = '0.1.7'
-  s.summary          = '0.1.7'
+  s.version          = '0.1.9'
+  s.summary          = '0.1.9'
 
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -33,7 +33,7 @@ TODO: Add long description of the pod here.
   s.source_files = 'CSFramework/Classes/**/*'
 
   s.resource_bundles = {
-    'CSFramework' => ['CSFramework/Assets/*.png', 'CSFramework/Classes/*.xib']
+    'CSFramework' => ['CSFramework/Classes/*.xib']
   }
 
   # s.public_header_files = 'Pod/Classes/**/*.h'

diff --git a/CSFramework/Classes/CSRequestManager.h b/CSFramework/Classes/CSRequestManager.h
@@ -43,7 +43,8 @@ typedef NS_ENUM(NSInteger, CSHttpMethod) {
        progress:(RequestProgressBlock)progressBlock
         success:(RequestSuccessBlock)successBlock
          failed:(RequestFailedBlock)failedBlock
-  authenticated:(BOOL)authenticated;
+  authenticated:(BOOL)authenticated
+canCancelOperation:(BOOL)canCancelOperation;
 
 // Upload Files (Array)
 - (void)request:(NSString *)URLString

diff --git a/CSFramework/Classes/CSRequestManager.m b/CSFramework/Classes/CSRequestManager.m
@@ -87,10 +87,15 @@ - (void)request:(NSString *)URLString
        progress:(RequestProgressBlock)progressBlock
         success:(RequestSuccessBlock)successBlock
          failed:(RequestFailedBlock)failedBlock
-  authenticated:(BOOL)authenticated {
-
-    [self initializeHTTPManagerAuthenticated:authenticated];
+  authenticated:(BOOL)authenticated
+canCancelOperation:(BOOL)canCancelOperation {
 
+    [self initializeHTTPManagerAuthenticated:authenticated];
+
+    if (canCancelOperation) {
+        [self.httpManager.operationQueue cancelAllOperations];
+    }
+
     RequestProgressBlock requestProgressBlock = ^(NSProgress *progress) {
 
         progressBlock(progress);

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj