From f08a5e198af38ed0670924e3e2190adcbf482edb Mon Sep 17 00:00:00 2001
From: shahas <shahas@flogic.in>
Date: Fri, 2 Jun 2017 19:36:47 +0530
Subject: [PATCH] code and perfomance optimaized

---
 BlueShift-iOS-SDK/BatchEventEntity.m          |  2 +-
 .../BlueShiftHttpRequestBatchUpload.m         | 28 ++++++++++---------
 .../HttpRequestOperationEntity.m              |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/BlueShift-iOS-SDK/BatchEventEntity.m b/BlueShift-iOS-SDK/BatchEventEntity.m
index d4e1e528..2ed5af5b 100644
--- a/BlueShift-iOS-SDK/BatchEventEntity.m
+++ b/BlueShift-iOS-SDK/BatchEventEntity.m
@@ -34,7 +34,7 @@ - (void)insertEntryParametersList:(NSArray *)parametersArray andNextRetryTimeSta
         [context performBlock:^{
             NSError *error = nil;
             [context save:&error];
-            [masterContext performBlockAndWait:^{
+            [masterContext performBlock:^{
                 NSError *error = nil;
                 [masterContext save:&error];
             }];
diff --git a/BlueShift-iOS-SDK/BlueShiftHttpRequestBatchUpload.m b/BlueShift-iOS-SDK/BlueShiftHttpRequestBatchUpload.m
index 695e98cb..c308b8c8 100644
--- a/BlueShift-iOS-SDK/BlueShiftHttpRequestBatchUpload.m
+++ b/BlueShift-iOS-SDK/BlueShiftHttpRequestBatchUpload.m
@@ -75,19 +75,9 @@ + (void)createBatches {
                                     }
                                     
                                     @try {
-                                        if(context && [context isKindOfClass:[NSManagedObjectContext class]]) {
-                                            [context performBlock:^{
-                                                if(masterContext && [masterContext isKindOfClass:[NSManagedObjectContext class]]) {
-                                                    [masterContext deleteObject:operationEntityToBeExecuted];
-                                                    NSError *saveError = nil;
-                                                    [context save:&saveError];
-                                                    [masterContext performBlock:^{
-                                                        NSError *saveError = nil;
-                                                        if (masterContext && [masterContext isKindOfClass:[NSManagedObjectContext class]]) {
-                                                            [masterContext save:&saveError];
-                                                        }
-                                                    }];
-                                                }
+                                        if(masterContext && [masterContext isKindOfClass:[NSManagedObjectContext class]]) {
+                                            [masterContext performBlockAndWait:^{
+                                                [masterContext deleteObject:operationEntityToBeExecuted];
                                             }];
                                         }
                                     }
@@ -99,6 +89,18 @@ + (void)createBatches {
                             [self createBatch:paramsArray];
                         }
                     }
+                    if (context && [context isKindOfClass:[NSManagedObjectContext class]]) {
+                        [context performBlock:^{
+                            NSError *saveError = nil;
+                            [context save:&saveError];
+                            [masterContext performBlock:^{
+                                NSError *saveError = nil;
+                                if (masterContext && [masterContext isKindOfClass:[NSManagedObjectContext class]]) {
+                                    [masterContext save:&saveError];
+                                }
+                            }];
+                        }];
+                    }
                 }
             }
         }];
diff --git a/BlueShift-iOS-SDK/HttpRequestOperationEntity.m b/BlueShift-iOS-SDK/HttpRequestOperationEntity.m
index e0fcbc82..6f009b1c 100644
--- a/BlueShift-iOS-SDK/HttpRequestOperationEntity.m
+++ b/BlueShift-iOS-SDK/HttpRequestOperationEntity.m
@@ -46,7 +46,7 @@ - (void)insertEntryWithMethod:(BlueShiftHTTPMethod)httpMethod andParameters:(NSD
         [context performBlock:^{
             NSError *error = nil;
             [context save:&error];
-            [masterContext performBlockAndWait:^{
+            [masterContext performBlock:^{
                 NSError *error = nil;
                 [masterContext save:&error];
             }];