Fixed crash when reloading Kite

OceanLabs · Jun 1, 2017 · 671b249 · 671b249
1 parent b12e3e2
commit 671b249
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/Kite-Print-SDK.podspec b/Kite-Print-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name                = 'Kite-Print-SDK'
-  spec.version             = '6.5.3'
+  spec.version             = '6.5.4'
   spec.license             = { :type => 'MIT', :file => 'Kite-SDK/LICENSE' }
   spec.homepage            = 'https://github.com/OceanLabs/iOS-Print-SDK'
   spec.authors             = {'Deon Botha' => '[email protected]'}

diff --git a/Kite-SDK/CHANGELOG.md b/Kite-SDK/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 6.5.4
+- Fixed crash when reloading Kite
+
 ### 6.5.3
 - Handle Print at Home SDK delegate calls internally if OLKiteDelegate doesn’t handle them.
 - First release of the Unity plugin

diff --git a/Kite-SDK/PSPrintSDK/KiteCI-Info.plist b/Kite-SDK/PSPrintSDK/KiteCI-Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.5.2</string>
+	<string>6.5.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Kite-SDK/PSPrintSDK/OLConstants.m b/Kite-SDK/PSPrintSDK/OLConstants.m
@@ -29,7 +29,7 @@
 
 #import "OLConstants.h"
 
-NSString *const kOLKiteSDKVersion = @"6.5.3";
+NSString *const kOLKiteSDKVersion = @"6.5.4";
 NSString *const kOLKiteSDKErrorDomain = @"co.oceanlabs.kOLKiteSDKErrorDomain";
 NSString *const kNotificationTemplateSyncComplete = @"co.oceanlabs.pssdk.notification.kNotificationSyncComplete";
 NSString *const kNotificationTemplateSyncPartialComplete = @"co.oceanlabs.pssdk.notification.kNotificationTemplateSyncPartialComplete";

diff --git a/Kite-SDK/PSPrintSDK/OLKiteViewController.m b/Kite-SDK/PSPrintSDK/OLKiteViewController.m
@@ -481,17 +481,25 @@ - (void)templateSyncDidReturn:(NSNotification *)n{
         if (!self.remoteThemePlistSyncOperation.finished && ![self.operationQueue.operations containsObject:self.remoteThemePlistSyncOperation]){
             if ([OLKiteABTesting sharedInstance].userConfig[@"theme"]){
                 __weak OLKiteViewController *welf = self;
-                    [[OLKiteABTesting sharedInstance] fetchRemotePlistsWithCompletionHandler:^{
+                [[OLKiteABTesting sharedInstance] fetchRemotePlistsWithCompletionHandler:^{
+                    if (![welf.remoteThemePlistSyncOperation isExecuting] && ![welf.remoteThemePlistSyncOperation isFinished]){
                         [welf.remoteThemePlistSyncOperation addExecutionBlock:^{}];
+                    }
+                    if (![welf.remoteThemePlistSyncOperation isExecuting] && ![welf.remoteThemePlistSyncOperation isFinished]){
                         [welf.operationQueue addOperation:welf.remoteThemePlistSyncOperation];
-                    }];
+                    }
+                }];
             }
             else{
-                [self.remoteThemePlistSyncOperation addExecutionBlock:^{}];
-                [self.operationQueue addOperation:self.remoteThemePlistSyncOperation];
+                if (!self.remoteThemePlistSyncOperation.executing && !self.remoteThemePlistSyncOperation.finished){
+                    [self.remoteThemePlistSyncOperation addExecutionBlock:^{}];
+                }
+                if (!self.remoteThemePlistSyncOperation.executing && !self.remoteThemePlistSyncOperation.finished){
+                    [self.operationQueue addOperation:self.remoteThemePlistSyncOperation];
+                }
             }
         }
-        if (!self.templateSyncOperation.finished){
+        if (!self.templateSyncOperation.executing && !self.templateSyncOperation.finished){
             [self.operationQueue addOperation:self.templateSyncOperation];
         }