- Trying synchronous

codedswitch · Aug 15, 2017 · 9154358 · 9154358
1 parent 42693aa
commit 9154358
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 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.9'
-  s.summary          = '0.1.9'
+  s.version          = '0.2.0'
+  s.summary          = '0.2.0'
 
 # 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?

diff --git a/CSFramework/Classes/CSRequestManager.h b/CSFramework/Classes/CSRequestManager.h
@@ -44,6 +44,7 @@ typedef NS_ENUM(NSInteger, CSHttpMethod) {
         success:(RequestSuccessBlock)successBlock
          failed:(RequestFailedBlock)failedBlock
   authenticated:(BOOL)authenticated
+  isSynchronous:(BOOL)isSynchronous
 canCancelOperation:(BOOL)canCancelOperation;
 
 // Upload Files (Array)

diff --git a/CSFramework/Classes/CSRequestManager.m b/CSFramework/Classes/CSRequestManager.m
@@ -88,6 +88,7 @@ - (void)request:(NSString *)URLString
         success:(RequestSuccessBlock)successBlock
          failed:(RequestFailedBlock)failedBlock
   authenticated:(BOOL)authenticated
+  isSynchronous:(BOOL)isSynchronous
 canCancelOperation:(BOOL)canCancelOperation {
 
     [self initializeHTTPManagerAuthenticated:authenticated];
@@ -96,6 +97,12 @@ - (void)request:(NSString *)URLString
         [self.httpManager.operationQueue cancelAllOperations];
     }
 
+    __block BOOL synchronous = NO;
+
+    if (isSynchronous) {
+        synchronous = YES;
+    }
+
     RequestProgressBlock requestProgressBlock = ^(NSProgress *progress) {
 
         progressBlock(progress);
@@ -105,6 +112,8 @@ - (void)request:(NSString *)URLString
         NSLog(@"Response Object: %@", responseObject);
 
         successBlock(task, responseObject);
+
+        synchronous = NO;
     };
 
     RequestFailedBlock requestFailedBlock = ^(NSURLSessionDataTask *task, NSError *error) {
@@ -120,6 +129,8 @@ - (void)request:(NSString *)URLString
         } else {
             failedBlock(task, error);
         }
+
+        synchronous = NO;
     };
 
     NSLog(LOG_API, URLString);
@@ -149,6 +160,10 @@ - (void)request:(NSString *)URLString
             [self.httpManager DELETE:URLString parameters:parameters success:requestSuccessBlock failure:requestFailedBlock];
             break;
     }
+
+    if (isSynchronous) {
+        while (synchronous) { }
+    }
 }
 
 - (void)initializeURLManager {