code and perfomance optimaized

blueshift-labs · Jun 5, 2017 · f08a5e1 · f08a5e1
1 parent d868bf8
commit f08a5e1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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];
             }];