Release 8.5.3 (#1276)

AirshipKit/AirshipConfig.xcconfig

@@ -1,6 +1,6 @@
 // Copyright 2017 Urban Airship and Contributors
 
-CURRENT_PROJECT_VERSION = 8.5.2
+CURRENT_PROJECT_VERSION = 8.5.3
 
 // Uncomment to include the preview build warning
 // OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1

AirshipKit/AirshipKit/common/UAPush.m

@@ -757,6 +757,7 @@ - (void)updateChannelRegistrationForcefully:(BOOL)forcefully {
             UA_STRONGIFY(self);
             [self updateChannelRegistrationForcefully:forcefully];
         });
+        return;
     }
 
     // Only cancel in flight requests if the channel is already created
@@ -778,6 +779,14 @@ - (void)updateChannelRegistrationForcefully:(BOOL)forcefully {
 }
 
 - (void)updateChannelTagGroups {
+    if (![NSThread isMainThread]) {
+        UA_WEAKIFY(self);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UA_STRONGIFY(self);
+            [self updateChannelTagGroups];
+        });
+        return;
+    }
 
     if (!self.channelID) {
         return;
@@ -789,7 +798,11 @@ - (void)updateChannelTagGroups {
         return;
     }
 
+    UA_WEAKIFY(self);
+
     __block UIBackgroundTaskIdentifier backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{
+        UA_STRONGIFY(self);
+
         UA_LTRACE(@"Tag groups background task expired.");
         [self.tagGroupsAPIClient cancelAllRequests];
         [self.dataStore addTagGroupsMutation:mutation atBeginning:YES forKey:UAPushTagGroupsMutationsKey];
@@ -809,15 +822,18 @@ - (void)updateChannelTagGroups {
     [self.tagGroupsAPIClient updateChannel:self.channelID
                          tagGroupsMutation:mutation
                          completionHandler:^(NSUInteger status) {
-
-                             if (status >= 200 && status <= 299) {
-                                 [self updateChannelTagGroups];
-                             } else if (status != 400 && status != 403) {
-                                 [self.dataStore addTagGroupsMutation:mutation atBeginning:YES forKey:UAPushTagGroupsMutationsKey];
-                             }
-
-                             [[UIApplication sharedApplication] endBackgroundTask:backgroundTask];
-                             backgroundTask = UIBackgroundTaskInvalid;
+                             dispatch_async(dispatch_get_main_queue(), ^{
+                                 UA_STRONGIFY(self);
+
+                                 if (status >= 200 && status <= 299) {
+                                     [self updateChannelTagGroups];
+                                 } else if (status != 400 && status != 403) {
+                                     [self.dataStore addTagGroupsMutation:mutation atBeginning:YES forKey:UAPushTagGroupsMutationsKey];
+                                 }
+
+                                 [[UIApplication sharedApplication] endBackgroundTask:backgroundTask];
+                                 backgroundTask = UIBackgroundTaskInvalid;
+                             });
                          }];
 }
 

AirshipKit/AirshipKit/common/UAUtils.h

@@ -182,15 +182,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSString *)deviceTokenStringFromDeviceToken:(NSData *)deviceToken;
 
-///---------------------------------------------------------------------------------------
-/// @name Thread management
-///---------------------------------------------------------------------------------------
-
-/**
- * A utility method to evaluate a block synchronously on the main thread.
- */
-+ (id)evaluateOnMainThread:(id (^__nonnull)(void))block;
-
 @end
 
 NS_ASSUME_NONNULL_END

AirshipKit/AirshipKit/common/UAUtils.m

@@ -348,21 +348,4 @@ + (NSString *)deviceTokenStringFromDeviceToken:(NSData *)deviceToken {
     return [deviceTokenString lowercaseString];
 }
 
-/** 
- * A utility method to evaluate a block synchronously on the main thread.
- */
-+ (id)evaluateOnMainThread:(id (^__nonnull)(void))block {
-    __block id result;
-
-    if ([NSThread isMainThread]) {
-        result = block();
-    } else {
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            result = block();
-        });
-    }
-
-    return result;
-}
-
 @end

AirshipKit/AirshipKit/common/UAirshipVersion.m

@@ -2,7 +2,7 @@
 
 #import "UAirshipVersion.h"
 
-NSString *const versionString = @"8.5.2";
+NSString *const versionString = @"8.5.3";
 
 @implementation UAirshipVersion
 

AirshipKit/AirshipKitTests/UALegacyPushTest.m

@@ -2355,6 +2355,7 @@ - (void)testUpdateTagGroups {
     self.push.channelID = @"someChannelID";
     self.push.channelLocation = @"someChannelLocation";
 
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Async update channel tag groups call"];
 
     // Expect a set mutation, return 200
     [[[self.mockTagGroupsAPIClient expect] andDo:^(NSInvocation *invocation) {
@@ -2376,6 +2377,8 @@ - (void)testUpdateTagGroups {
         void *arg;
         [invocation getArgument:&arg atIndex:4];
 
+        [expectation fulfill];
+
         void (^completionHandler)(NSUInteger) = (__bridge void (^)(NSUInteger))arg;
         completionHandler(200);
     }] updateChannel:@"someChannelID"
@@ -2391,6 +2394,8 @@ - (void)testUpdateTagGroups {
 
     [self.push updateRegistration];
 
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+
     [self.mockTagGroupsAPIClient verify];
 }
 

AirshipKit/AirshipKitTests/UAPushTest.m

@@ -2505,6 +2505,7 @@ - (void)testUpdateTagGroups {
     self.push.channelID = @"someChannelID";
     self.push.channelLocation = @"someChannelLocation";
 
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Async update channel tag groups call"];
 
     // Expect a set mutation, return 200
     [[[self.mockTagGroupsAPIClient expect] andDo:^(NSInvocation *invocation) {
@@ -2526,6 +2527,8 @@ - (void)testUpdateTagGroups {
         void *arg;
         [invocation getArgument:&arg atIndex:4];
 
+        [expectation fulfill];
+
         void (^completionHandler)(NSUInteger) = (__bridge void (^)(NSUInteger))arg;
         completionHandler(200);
     }] updateChannel:@"someChannelID"
@@ -2541,6 +2544,8 @@ - (void)testUpdateTagGroups {
 
     [self.push updateRegistration];
 
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+
     [self.mockTagGroupsAPIClient verify];
 }
 

AirshipKit/AirshipKitTests/UAUtilsTest.m

@@ -322,34 +322,4 @@ - (void)testIsAlertingPushNo {
     XCTAssertFalse([UAUtils isAlertingPush:soundNotification]);
 }
 
-- (void)testEvaluateOnMainThreadWhenOnMainThread {
-    XCTAssertTrue([NSThread isMainThread],@"Tests are expected to run on the main thread");
-    NSNumber *returnValue = @NO;
-    returnValue = [UAUtils evaluateOnMainThread:^id{
-        XCTAssertTrue([NSThread isMainThread],@"should run on the main thread");
-        return @YES;
-    }];
-
-    XCTAssertTrue([returnValue boolValue]);
-}
-
-- (void)testEvaluateOnMainThreadWhenNotOnMainThread {
-    XCTAssertTrue([NSThread isMainThread],@"Tests are expected to run on the main thread");
-    XCTestExpectation *blockRan = [self expectationWithDescription:@"Block ran"];
-
-    __block NSNumber *returnValue = @NO;
-    dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void){
-        XCTAssertFalse([NSThread isMainThread],@"should not run on the main thread");
-        returnValue = [UAUtils evaluateOnMainThread:^id{
-            XCTAssertTrue([NSThread isMainThread],@"should run on the main thread");
-            [blockRan fulfill];
-            return @YES;
-        }];
-        XCTAssertTrue([returnValue boolValue]);
-    });
-
-    [self waitForExpectationsWithTimeout:10 handler:nil];
-
-}
-
 @end

CHANGELOG.md

@@ -3,6 +3,21 @@ iOS Changelog
 
 Migration Guides: Documentation/Migration
 
+Version 8.5.3 - August 22, 2017
+===============================
+Patch release that fixes missing symbol issues for the static library and removes
+the use of `dispatch_sync` when calling UIKit from a background thread. Applications
+that use the static library or have had concerns about the use of `dispatch_sync`
+should update.
+
+Bug fixes
+---------
+- Fixed missing symbols for StoreKit and WebKit when using the static library.
+
+Behavior Changes
+----------------
+- Removed use of `dispatch_sync` within the push module.
+
 Version 8.5.2 - August 9, 2017
 ==============================
 Patch release that fixes issues with message center, applications that use

UrbanAirship-iOS-AppExtensions.podspec

@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-    s.version                 = "8.5.2"
+    s.version                 = "8.5.3"
 
     s.name                    = "UrbanAirship-iOS-AppExtensions"
     s.summary                 = "Urban Airship iOS App Extensions"

UrbanAirship-iOS-SDK.podspec

@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-   s.version                 = "8.5.2"
+   s.version                 = "8.5.3"
    s.name                    = "UrbanAirship-iOS-SDK"
    s.summary                 = "Urban Airship iOS SDK"