Fixes some format issues

* Resolves a few typos/conflicts that broke buttons and attachments on the old push notification format vs. new.

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload.m

@@ -61,12 +61,18 @@ -(void)parseOriginalPayload {
         [self parseRemoteSlient:_rawPayload];
     else {
         [self parseApnsFields];
-        _attachments = _rawPayload[@"at"];
-        [self parseActionButtons:_rawPayload[@"o"]];
+        _attachments = _rawPayload[@"att"];
+        [self parseActionButtons:_rawPayload[@"buttons"]];
     }
 
     [self parseCommonOneSignalFields:_rawPayload[@"custom"]];
     _additionalData = _rawPayload[@"custom"][@"a"];
+    
+    //fixes an issue where actionSelected was a top level property in _rawPayload
+    //and 'actionSelected' was not being set in additionalData
+    if (_rawPayload[@"actionSelected"] && !_additionalData) {
+        _additionalData = @{@"actionSelected" : _rawPayload[@"actionSelected"]};
+    }
 }
 
 // New OneSignal playload format.

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -1248,31 +1248,23 @@ - (void)testNotificationOpenFromButtonPressWithNewformat {
 }
 
 // Testing iOS 10 - 2.4.0+ button fromat - with os_data aps payload format
-- (void)testNotificationAlertButtonsDisplayWithNewformat {
+- (void)notificationAlertButtonsDisplayWithFormat:(NSDictionary *)userInfo {
     __block BOOL openedWasFire = false;
-    
-    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba" handleNotificationAction:^(OSNotificationOpenedResult *result) {
+    id receiveBlock = ^(OSNotificationOpenedResult *result) {
         XCTAssertEqual(result.action.type, OSNotificationActionTypeActionTaken);
         XCTAssertEqualObjects(result.action.actionID, @"id1");
         id actionButons = @[@{@"id": @"id1", @"text": @"text1"}];
         XCTAssertEqualObjects(result.notification.payload.actionButtons, actionButons);
         XCTAssertEqualObjects(result.notification.payload.additionalData[@"actionSelected"], @"id1");
 
         openedWasFire = true;
-    }];
+    };
+    
+    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba" handleNotificationAction:receiveBlock];
 
     [self resumeApp];
     [self runBackgroundThreads];
 
-    id userInfo = @{@"aps": @{
-                            @"mutable-content": @1,
-                            @"alert": @{@"body": @"Message Body", @"title": @"title"}
-                            },
-                    @"os_data": @{
-                            @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bf",
-                            @"buttons": @[@{@"i": @"id1", @"n": @"text1"}],
-                            }};
-    
     id notifResponse = [self createBasiciOSNotificationResponseWithPayload:userInfo];
     [notifResponse setValue:@"id1" forKeyPath:@"actionIdentifier"];
 
@@ -1287,6 +1279,34 @@ - (void)testNotificationAlertButtonsDisplayWithNewformat {
     XCTAssertEqual(openedWasFire, true);
 }
 
+- (void)testOldFormatNotificationAlertButtonsDisplay {
+    id oldFormat = @{@"aps" : @{
+                             @"mutable-content" : @1,
+                             @"alert" : @{
+                                     @"title" : @"Test Title"
+                                     }
+                             },
+                     @"buttons" : @[@{@"i": @"id1", @"n": @"text1"}],
+                     @"custom" : @{
+                             @"i" : @"b2f7f966-d8cc-11e4-bed1-df8f05be55bf"
+                             }
+                     };
+    
+    [self notificationAlertButtonsDisplayWithFormat:oldFormat];
+}
+
+- (void)testNewFormatNotificationAlertButtonsDisplay {
+    id newFormat = @{@"aps": @{
+                             @"mutable-content": @1,
+                             @"alert": @{@"body": @"Message Body", @"title": @"title"}
+                             },
+                     @"os_data": @{
+                             @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bf",
+                             @"buttons": @[@{@"i": @"id1", @"n": @"text1"}],
+                             }};
+    
+    [self notificationAlertButtonsDisplayWithFormat:newFormat];
+}
 
 // Testing iOS 10 - with original aps payload format
 - (void)testOpeningWithAdditionalData {
@@ -1332,30 +1352,20 @@ - (void)testOpeningWithAdditionalData {
 }
 
 // Testing iOS 10 - pre-2.4.0 button fromat - with os_data aps payload format
-- (void)testRecievedCallbackWithButtons {
+- (void)receivedCallbackWithButtonsWithUserInfo:(NSDictionary *)userInfo {
     __block BOOL recievedWasFire = false;
 
     [OneSignal initWithLaunchOptions:nil
                                appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"
           handleNotificationReceived:^(OSNotification *notification) {
-            recievedWasFire = true;
-            let actionButons = @[ @{@"id": @"id1", @"text": @"text1"} ];
-            XCTAssertEqualObjects(notification.payload.actionButtons, actionButons);
+              recievedWasFire = true;
+              let actionButons = @[ @{@"id": @"id1", @"text": @"text1"} ];
+              XCTAssertEqualObjects(notification.payload.actionButtons, actionButons);
           }
             handleNotificationAction:nil
                             settings:nil];
     [self runBackgroundThreads];
 
-    let userInfo = @{@"aps": @{@"content_available": @1},
-                     @"os_data": @{
-                        @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb",
-                        @"buttons": @{
-                            @"m": @"alert body only",
-                            @"o": @[@{@"i": @"id1", @"n": @"text1"}]
-                        }
-                      }
-                   };
-    
     let notifResponse = [self createBasiciOSNotificationResponseWithPayload:userInfo];
     UNUserNotificationCenter *notifCenter = [UNUserNotificationCenter currentNotificationCenter];
     let notifCenterDelegate = notifCenter.delegate;
@@ -1368,6 +1378,33 @@ - (void)testRecievedCallbackWithButtons {
     XCTAssertEqual(recievedWasFire, true);
 }
 
+- (void)testReceivedCallbackWithButtonsWithNewFormat {
+    let newFormat = @{@"aps": @{@"content_available": @1},
+                      @"os_data": @{
+                              @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb",
+                              @"buttons": @{
+                                      @"m": @"alert body only",
+                                      @"o": @[@{@"i": @"id1", @"n": @"text1"}]
+                                      }
+                              }
+                      };
+    
+    id oldFormat = @{@"aps" : @{
+                             @"mutable-content" : @1,
+                             @"alert" : @{
+                                     @"title" : @"Test Title"
+                                     }
+                             },
+                     @"buttons" : @[@{@"i": @"id1", @"n": @"text1"}],
+                     @"custom" : @{
+                             @"i" : @"b2f7f966-d8cc-11e4-bed1-df8f05be55bf"
+                             }
+                     };
+    
+    [self receivedCallbackWithButtonsWithUserInfo:newFormat];
+    [self receivedCallbackWithButtonsWithUserInfo:oldFormat];
+}
+
 -(void)fireDidReceiveRemoteNotification:(NSDictionary*)userInfo {
     let appDelegate = [UIApplication sharedApplication].delegate;
     [appDelegate application:[UIApplication sharedApplication]
@@ -1702,50 +1739,49 @@ -(UNNotificationCategory*)unNotificagionCategoryWithId:(NSString*)identifier {
 }
 
 // iOS 10 - Notification Service Extension test
-- (void)testDidReceiveNotificatioExtensionRequest {
-    // Example of a pre-existing category a developer setup.
-    //   Plus possibly an existing "__dynamic__" category of ours.
-    let categorySet = [NSMutableSet new];
-    [categorySet addObject:[self unNotificagionCategoryWithId:@"some_category"]];
-    [categorySet addObject:[self unNotificagionCategoryWithId:@"__dynamic__"]];
-    [categorySet addObject:[self unNotificagionCategoryWithId:@"some_category2"]];
-    [[UNUserNotificationCenter currentNotificationCenter] setNotificationCategories:categorySet];
-    
-    var userInfo = @{@"aps": @{
-                        @"mutable-content": @1,
-                        @"alert": @"Message Body"
-                    },
-                    @"os_data": @{
-                        @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb",
-                        @"buttons": @[@{@"i": @"id1", @"n": @"text1"}],
-                        @"att": @{ @"id": @"http://domain.com/file.jpg" }
-                    }};
+- (void) didReceiveNotificationExtensionRequestDontOverrideCateogoryWithUserInfo:(NSDictionary *)userInfo {
+    id notifResponse = [self createBasiciOSNotificationResponseWithPayload:userInfo];
 
-    var notifResponse = [self createBasiciOSNotificationResponseWithPayload:userInfo];
-    let content = [OneSignal didReceiveNotificationExtensionRequest:[notifResponse notification].request withMutableNotificationContent:nil];
+    [[notifResponse notification].request.content setValue:@"some_category" forKey:@"categoryIdentifier"];
 
-    // Make sure butons were added.
-    XCTAssertEqualObjects(content.categoryIdentifier, @"__dynamic__");
+    UNMutableNotificationContent* content = [OneSignal didReceiveNotificationExtensionRequest:[notifResponse notification].request withMutableNotificationContent:nil];
+    
+    // Make sure we didn't override an existing category
+    XCTAssertEqualObjects(content.categoryIdentifier, @"some_category");
     // Make sure attachments were added.
     XCTAssertEqualObjects(content.attachments[0].identifier, @"id");
     XCTAssertEqualObjects(content.attachments[0].URL.scheme, @"file");
-    
-    
-    // Run again with different buttons.
-    userInfo = @{@"aps": @{
-                     @"mutable-content": @1,
-                     @"alert": @"Message Body"
-                 },
-                 @"os_data": @{
-                     @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb",
-                     @"buttons": @[@{@"i": @"id2", @"n": @"text2"}],
-                     @"att": @{ @"id": @"http://domain.com/file.jpg"}
-                 }};
-    
-    notifResponse = [self createBasiciOSNotificationResponseWithPayload:userInfo];
-    [OneSignal didReceiveNotificationExtensionRequest:[notifResponse notification].request withMutableNotificationContent:nil];
-    
-    XCTAssertEqual(UNUserNotificationCenterOverrider.lastSetCategoriesCount, 3);
+}
+
+- (void)testDidReceiveNotificationExtensionRequestDontOverrideCategory
+{
+    id newFormat = @{@"aps": @{
+                             @"mutable-content": @1,
+                             @"alert": @"Message Body"
+                             },
+                     @"os_data": @{
+                             @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb",
+                             @"buttons": @[@{@"i": @"id1", @"n": @"text1"}],
+                             @"att": @{ @"id": @"http://domain.com/file.jpg" }
+                             }};
+    
+    id oldFormat = @{@"aps" : @{
+                             @"mutable-content" : @1,
+                             @"alert" : @{
+                                     @"title" : @"Test Title"
+                                     }
+                             },
+                     
+                     @"att": @{ @"id": @"http://domain.com/file.jpg" },
+                     @"buttons" : @[@{@"i": @"id1", @"n": @"text1"}],
+                     @"custom" : @{
+                             @"i" : @"b2f7f966-d8cc-11e4-bed1-df8f05be55bf"
+                             }
+                     };
+    
+    
+    [self didReceiveNotificationExtensionRequestDontOverrideCateogoryWithUserInfo:oldFormat];
+    [self didReceiveNotificationExtensionRequestDontOverrideCateogoryWithUserInfo:newFormat];
 }
 
 // iOS 10 - Notification Service Extension test