Merge branch 'main' into improvements/Remove-dismissalDate-from-APNSStartLiveActivityNotification

Author: Myrronth

SUPPORT.md

@@ -5,8 +5,9 @@ Please refer to the [Contributing](CONTRIBUTING.md) section for more information
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 6.x.x   | :white_check_mark: |
 | 5.x.x   | :white_check_mark: |
-| 4.x.x   | :white_check_mark: |
+| 4.x.x   | ❌ |
 | 3.x.x   | ❌ |
 | 2.x.x   | ❌ |
 | 1.x.x   | ❌ |

Sources/APNSCore/LiveActivity/APNSStartLiveActivityNotification.swift

@@ -91,6 +91,7 @@ public struct APNSStartLiveActivityNotification<Attributes: Encodable & Sendable
     ///   - appID: Your app’s bundle ID/app ID. This will be suffixed with `.push-type.liveactivity`.
     ///   - contentState: Updated content-state of live activity
     ///   - timestamp: Timestamp when sending notification
+    ///   - staleDate: Timestamp when the notification is marked as stale
     ///   - apnsID: A canonical UUID that identifies the notification.
     ///   - attributes: The ActivityAttributes of the live activity to start
     ///   - attributesType: The type name of the ActivityAttributes you want to send
@@ -101,6 +102,7 @@ public struct APNSStartLiveActivityNotification<Attributes: Encodable & Sendable
         appID: String,
         contentState: ContentState,
         timestamp: Int,
+        staleDate: Int? = nil,
         apnsID: UUID? = nil,
         attributes: Attributes,
         attributesType: String,
@@ -109,6 +111,7 @@ public struct APNSStartLiveActivityNotification<Attributes: Encodable & Sendable
       self.aps = APNSStartLiveActivityNotificationAPSStorage(
           timestamp: timestamp,
           contentState: contentState,
+          staleDate: staleDate,
           alert: alert,
           attributes: attributes,
           attributesType: attributesType

Sources/APNSCore/LiveActivity/APNSStartLiveActivityNotificationAPSStorage.swift

@@ -19,6 +19,7 @@ struct APNSStartLiveActivityNotificationAPSStorage<Attributes: Encodable & Senda
         case timestamp = "timestamp"
         case event = "event"
         case contentState = "content-state"
+        case staleDate = "stale-date"
         case alert = "alert"
         case attributes = "attributes"
         case attributesType = "attributes-type"
@@ -27,19 +28,22 @@ struct APNSStartLiveActivityNotificationAPSStorage<Attributes: Encodable & Senda
     var timestamp: Int
     var event: String = "start"
     var contentState: ContentState
+    var staleDate: Int?
     var alert: APNSAlertNotificationContent
     var attributes: Attributes
     var attributesType: String
 
     init(
         timestamp: Int,
         contentState: ContentState,
+        staleDate: Int?,
         alert: APNSAlertNotificationContent,
         attributes: Attributes,
         attributesType: String
     ) {
         self.timestamp = timestamp
         self.contentState = contentState
+        self.staleDate = staleDate
         self.alert = alert
         self.attributes = attributes
         self.attributesType = attributesType

Tests/APNSTests/LiveActivity/APNSLiveActivityNotificationTests.swift

@@ -106,6 +106,7 @@ final class APNSLiveActivityNotificationTests: XCTestCase {
             appID: "test.app.id",
             contentState: State(),
             timestamp: 1_672_680_658,
+            staleDate: 1_672_680_800,
             attributes: Attributes(),
             attributesType: "Attributes",
             alert: .init(title: .raw("Hi"), body: .raw("Hello"))
@@ -115,7 +116,8 @@ final class APNSLiveActivityNotificationTests: XCTestCase {
         let data = try encoder.encode(notification)
 
         let expectedJSONString = """
-            {"aps":{"event":"start", "alert": { "title": "Hi", "body": "Hello" }, "attributes-type": "Attributes", "attributes": {"name":"Test Attribute"},"content-state":{"string":"Test","number":123},"timestamp":1672680658}}
+            {"aps":{"event":"start", "alert": { "title": "Hi", "body": "Hello" }, "attributes-type": "Attributes", "attributes": {"name":"Test Attribute"},"content-state":{"string":"Test","number":123},"timestamp":1672680658,
+            "stale-date":1672680800}}
             """
 
         let jsonObject1 = try JSONSerialization.jsonObject(with: data) as! NSDictionary