Merge pull request #963 from OneSignal/feature/interruption_and_relevance_score

Interruption Level and Relevance Score

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSNotification.m

@@ -189,12 +189,20 @@ - (void)parseOtherApnsFields {
     if (aps[@"thread-id"]) {
         _threadId = (NSString *)aps[@"thread-id"];
     }
+
+    if (aps[@"relevance-score"]) {
+        _relevanceScore = (NSNumber *)aps[@"relevance-score"];
+    }
+    
+    if (aps[@"interruption-level"]) {
+        _interruptionLevel = (NSString *)aps[@"interruption-level"];
+    }
 
     _category = aps[@"category"];
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat: @"notificationId=%@ templateId=%@ templateName=%@ contentAvailable=%@ mutableContent=%@ category=%@ rawPayload=%@", _notificationId, _templateId, _templateName, _contentAvailable ? @"YES" : @"NO", _mutableContent ? @"YES" : @"NO", _category, _rawPayload];
+    return [NSString stringWithFormat: @"notificationId=%@ templateId=%@ templateName=%@ contentAvailable=%@ mutableContent=%@ category=%@ relevanceScore=%@ interruptionLevel=%@ rawPayload=%@", _notificationId, _templateId, _templateName, _contentAvailable ? @"YES" : @"NO", _mutableContent ? @"YES" : @"NO", _category, _relevanceScore, _interruptionLevel, _rawPayload];
 }
 
 - (NSDictionary *)jsonRepresentation {
@@ -253,6 +261,12 @@ - (NSDictionary *)jsonRepresentation {
 
     if (self.category)
         [obj setObject:self.category forKeyedSubscript: @"category"];
+    
+    if (self.relevanceScore)
+        [obj setObject:self.relevanceScore forKeyedSubscript: @"relevanceScore"];
+    
+    if (self.interruptionLevel)
+        [obj setObject:self.interruptionLevel forKeyedSubscript: @"interruptionLevel"];
 
     return obj;
 }

iOS_SDK/OneSignalSDK/Source/OneSignal.h

@@ -130,6 +130,12 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType)  {
 /* iOS 10+ : Groups notifications into threads */
 @property(readonly, nullable)NSString *threadId;
 
+/* iOS 15+ : Relevance Score for notification summary */
+@property(readonly, nullable)NSNumber *relevanceScore;
+
+/* iOS 15+ : Interruption Level */
+@property(readonly)NSString *interruptionLevel;
+
 /* Parses an APNS push payload into a OSNotification object.
    Useful to call from your NotificationServiceExtension when the
       didReceiveNotificationRequest:withContentHandler: method fires. */

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -3114,6 +3114,8 @@ - (void)testNotificationJson {
                             @"content-available": @1,
                             @"mutable-content": @1,
                             @"alert": @"Message Body",
+                            @"relevance-score": @0.15,
+                            @"interruption-level": @"time-sensitive",
                         },
                         @"os_data": @{
                             @"i": @"notif id",