review: Use Date instead of UInt64 for expiration time

Author: BillCarsonFr

ElementX/Sources/Services/ElementCall/ElementCallService.swift

@@ -177,18 +177,19 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
         let callID = CallID(callKitID: UUID(), roomID: roomID, rtcNotificationID: rtcNotificationID)
         incomingCallID = callID
 
-        guard let expirationTimestamp = (payload.dictionaryPayload[ElementCallServiceNotificationKey.expirationTimestampMillis.rawValue] as? NSNumber)?.uint64Value else {
+        guard let expirationDate = (payload.dictionaryPayload[ElementCallServiceNotificationKey.expirationDate.rawValue] as? Date) else {
             MXLog.error("Something went wrong, missing expiration timestamp for incoming voip call: \(payload)")
             return
         }
-        let nowTimestampMillis = UInt64(timeClock.nowDate().timeIntervalSince1970 * 1000)
 
-        guard nowTimestampMillis < expirationTimestamp else {
+        let nowDate = timeClock.nowDate()
+        
+        guard nowDate < expirationDate else {
             MXLog.warning("Call expired for room \(roomID), ignoring incoming push")
             return
         }
 
-        let ringDurationMillis = min(expirationTimestamp - nowTimestampMillis, 90000)
+        let ringDurationMillis = min(expirationDate.timeIntervalSince1970 - nowDate.timeIntervalSince1970, 90) * 1000
 
         let roomDisplayName = payload.dictionaryPayload[ElementCallServiceNotificationKey.roomDisplayName.rawValue] as? String
 

ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift

@@ -14,8 +14,8 @@ enum ElementCallServiceNotificationKey: String {
     /// When an incoming call is set to ring, there will be a `m.rtc.notification`event  (MSC4075).
     /// Keep the notification event id as it is needed to decline calls (MSC4310).
     case rtcNotifyEventID
-    /// The local timestamp in millis at which the incoming call should stop ringing.
-    case expirationTimestampMillis
+    /// The Date at which the incoming call should stop ringing.
+    case expirationDate
 }
 
 let ElementCallServiceNotificationDiscardDelta = 15.0

NSE/Sources/NotificationHandler.swift

@@ -210,9 +210,10 @@ class NotificationHandler {
             }
         }
 
+        let expirationDate = Date(timeIntervalSince1970: TimeInterval(expirationTimestamp / 1000))
         let payload = [ElementCallServiceNotificationKey.roomID.rawValue: roomID,
                        ElementCallServiceNotificationKey.roomDisplayName.rawValue: roomDisplayName,
-                       ElementCallServiceNotificationKey.expirationTimestampMillis.rawValue: expirationTimestamp,
+                       ElementCallServiceNotificationKey.expirationDate.rawValue: expirationDate,
                        ElementCallServiceNotificationKey.rtcNotifyEventID.rawValue: rtcNotifyEventID] as [String: Any]
 
         do {

UnitTests/Sources/ElementCallServiceTests.swift

@@ -117,15 +117,15 @@ private class PKPushPayloadMock: PKPushPayload {
         dict[ElementCallServiceNotificationKey.roomID.rawValue] = "!room:example.com"
         dict[ElementCallServiceNotificationKey.roomDisplayName.rawValue] = "welcome"
         dict[ElementCallServiceNotificationKey.rtcNotifyEventID.rawValue] = "$000"
-        dict[ElementCallServiceNotificationKey.expirationTimestampMillis.rawValue] = 10
+        dict[ElementCallServiceNotificationKey.expirationDate.rawValue] = Date(timeIntervalSince1970: 10)
     }
 
     override var dictionaryPayload: [AnyHashable: Any] {
         dict
     }
 
     func addSeconds(_ from: Date, lifetime: Int) -> Self {
-        dict[ElementCallServiceNotificationKey.expirationTimestampMillis.rawValue] = UInt64(from.timeIntervalSince1970 * 1000) + UInt64(lifetime)
+        dict[ElementCallServiceNotificationKey.expirationDate.rawValue] = from.addingTimeInterval(TimeInterval(lifetime))
         return self
     }
 }