Release 8.6.3 (#1313)

olx-mena · Nov 20, 2017 · 63eda69 · 63eda69
1 parent 7be0157
commit 63eda69
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 16 deletions.
diff --git a/AirshipKit/AirshipConfig.xcconfig b/AirshipKit/AirshipConfig.xcconfig
@@ -1,6 +1,6 @@
 // Copyright 2017 Urban Airship and Contributors
 
-CURRENT_PROJECT_VERSION = 8.6.2
+CURRENT_PROJECT_VERSION = 8.6.3
 
 // Uncomment to include the preview build warning
 // OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1
diff --git a/AirshipKit/AirshipKit/common/UAirshipVersion.m b/AirshipKit/AirshipKit/common/UAirshipVersion.m
@@ -2,7 +2,7 @@
 
 #import "UAirshipVersion.h"
 
-NSString *const versionString = @"8.6.2";
+NSString *const versionString = @"8.6.3";
 
 @implementation UAirshipVersion
 

diff --git a/AirshipKit/AirshipKit/ios/UAInboxMessageList.m b/AirshipKit/AirshipKit/ios/UAInboxMessageList.m
@@ -148,12 +148,16 @@ - (UADisposable *)retrieveMessageListWithSuccessBlock:(UAInboxMessageListCallbac
             }];
         } else {
             UA_LDEBUG(@"Retrieve message list succeeded with status: %lu", (unsigned long)status);
-            completionBlock(YES);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completionBlock(YES);
+            });
         }
 
     } onFailure:^(){
         UA_LDEBUG(@"Retrieve message list failed");
-        completionBlock(NO);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            completionBlock(NO);
+        });
     }];
 
     return disposable;
@@ -263,8 +267,8 @@ - (void)loadSavedMessages {
 
 
 /**
- * Refreshes the publicly exposed inbox messages, by prefetching on the private
- * context and then updating on the main context.
+ * Refreshes the publicly exposed inbox messages on the private context. 
+ * The completion handler is executed on the main context.
  *
  * @param completionHandler Optional completion handler.
  */
@@ -295,7 +299,9 @@ - (void)refreshInboxWithCompletionHandler:(void (^)(void))completionHandler {
                                   self.messages = messages;
 
                                   if (completionHandler) {
-                                      completionHandler();
+                                      dispatch_async(dispatch_get_main_queue(), ^{
+                                          completionHandler();
+                                      });
                                   }
                               }];
 }

diff --git a/AirshipKit/AirshipKitTests/UAInboxMessageListTest.m b/AirshipKit/AirshipKitTests/UAInboxMessageListTest.m
@@ -200,9 +200,14 @@ __block void (^trigger)(void) = ^{
         };
     }] retrieveMessageListOnSuccess:[OCMArg any] onFailure:[OCMArg any]];
 
-
-    [[self.mockMessageListNotificationObserver expect] messageListWillUpdate];
-    [[self.mockMessageListNotificationObserver expect] messageListUpdated];
+    XCTestExpectation *messageListWillUpdateExpectation = [self expectationWithDescription:@"messageListWillUpdate notification received"];
+    XCTestExpectation *messageListUpdatedExpectation = [self expectationWithDescription:@"messageListUpdated notification received"];
+    [[[self.mockMessageListNotificationObserver expect] andDo:^(NSInvocation *invocation) {
+        [messageListWillUpdateExpectation fulfill];
+    }] messageListWillUpdate];
+    [[[self.mockMessageListNotificationObserver expect] andDo:^(NSInvocation *invocation) {
+        [messageListUpdatedExpectation fulfill];
+    }] messageListUpdated];
 
     __block BOOL fail = NO;
 
@@ -231,7 +236,7 @@ __block void (^trigger)(void) = ^{
     }];
 
     XCTAssertFalse(fail, @"callback blocks should not have been executed");
-
+    
     [self.mockMessageListNotificationObserver verify];
 }
 
@@ -255,8 +260,14 @@ __block void (^trigger)(void) = ^{
         };
     }] retrieveMessageListOnSuccess:[OCMArg any] onFailure:[OCMArg any]];
 
-    [[self.mockMessageListNotificationObserver expect] messageListWillUpdate];
-    [[self.mockMessageListNotificationObserver expect] messageListUpdated];
+    XCTestExpectation *messageListWillUpdateExpectation = [self expectationWithDescription:@"messageListWillUpdate notification received"];
+    XCTestExpectation *messageListUpdatedExpectation = [self expectationWithDescription:@"messageListUpdated notification received"];
+    [[[self.mockMessageListNotificationObserver expect] andDo:^(NSInvocation *invocation) {
+        [messageListWillUpdateExpectation fulfill];
+    }] messageListWillUpdate];
+    [[[self.mockMessageListNotificationObserver expect] andDo:^(NSInvocation *invocation) {
+        [messageListUpdatedExpectation fulfill];
+    }] messageListUpdated];
 
     __block BOOL fail = NO;
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ iOS Changelog
 
 Migration Guides: Documentation/Migration
 
+Version 8.6.3 - November 20, 2017
+==================================
+Patch release to address "UI API called on a background thread" warnings. Applications should update to this release if they are seeing these warnings.
+
+Bug fixes
+---------
+- Fix UI API access on background thread in Message Center.
+
 Version 8.6.2 - October 30, 2017
 ==================================
 Patch release to correctly parse "mailto:" URLs in message center messages and enable optional localization of Message Center's "Done" and "Edit" buttons. Applications should update to this release if they require this behavior.

diff --git a/UrbanAirship-iOS-AppExtensions.podspec b/UrbanAirship-iOS-AppExtensions.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-    s.version                 = "8.6.2"
+    s.version                 = "8.6.3"
 
     s.name                    = "UrbanAirship-iOS-AppExtensions"
     s.summary                 = "Urban Airship iOS App Extensions"

diff --git a/UrbanAirship-iOS-SDK.podspec b/UrbanAirship-iOS-SDK.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |s|
-   s.version                 = "8.6.2"
+   s.version                 = "8.6.3"
    s.name                    = "UrbanAirship-iOS-SDK"
    s.summary                 = "Urban Airship iOS SDK"
 

diff --git a/scripts/run_ci_tasks.sh b/scripts/run_ci_tasks.sh
@@ -43,7 +43,7 @@ xcrun xcodebuild -destination "${TEST_DESTINATION}" -workspace "${ROOT_PATH}/Air
 
 # Run pod lib lint
 cd $ROOT_PATH
-pod lib lint
+pod lib lint --allow-warnings
 cd -
 
 # delete derived data