review: use correct ID instead of Id naming convention

BillCarsonFr · BillCarsonFr · commit b48069576c19 · 2025-09-16T09:38:11.000+02:00
diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -8999,72 +8999,72 @@ class JoinedRoomProxyMock: JoinedRoomProxyProtocol, @unchecked Sendable {
     }
     //MARK: - declineCall
 
-    var declineCallNotificationIdUnderlyingCallsCount = 0
-    var declineCallNotificationIdCallsCount: Int {
+    var declineCallNotificationIDUnderlyingCallsCount = 0
+    var declineCallNotificationIDCallsCount: Int {
         get {
             if Thread.isMainThread {
-                return declineCallNotificationIdUnderlyingCallsCount
+                return declineCallNotificationIDUnderlyingCallsCount
             } else {
                 var returnValue: Int? = nil
                 DispatchQueue.main.sync {
-                    returnValue = declineCallNotificationIdUnderlyingCallsCount
+                    returnValue = declineCallNotificationIDUnderlyingCallsCount
                 }
 
                 return returnValue!
             }
         }
         set {
             if Thread.isMainThread {
-                declineCallNotificationIdUnderlyingCallsCount = newValue
+                declineCallNotificationIDUnderlyingCallsCount = newValue
             } else {
                 DispatchQueue.main.sync {
-                    declineCallNotificationIdUnderlyingCallsCount = newValue
+                    declineCallNotificationIDUnderlyingCallsCount = newValue
                 }
             }
         }
     }
-    var declineCallNotificationIdCalled: Bool {
-        return declineCallNotificationIdCallsCount > 0
+    var declineCallNotificationIDCalled: Bool {
+        return declineCallNotificationIDCallsCount > 0
     }
-    var declineCallNotificationIdReceivedNotificationId: String?
-    var declineCallNotificationIdReceivedInvocations: [String] = []
+    var declineCallNotificationIDReceivedNotificationID: String?
+    var declineCallNotificationIDReceivedInvocations: [String] = []
 
-    var declineCallNotificationIdUnderlyingReturnValue: Result<Void, RoomProxyError>!
-    var declineCallNotificationIdReturnValue: Result<Void, RoomProxyError>! {
+    var declineCallNotificationIDUnderlyingReturnValue: Result<Void, RoomProxyError>!
+    var declineCallNotificationIDReturnValue: Result<Void, RoomProxyError>! {
         get {
             if Thread.isMainThread {
-                return declineCallNotificationIdUnderlyingReturnValue
+                return declineCallNotificationIDUnderlyingReturnValue
             } else {
                 var returnValue: Result<Void, RoomProxyError>? = nil
                 DispatchQueue.main.sync {
-                    returnValue = declineCallNotificationIdUnderlyingReturnValue
+                    returnValue = declineCallNotificationIDUnderlyingReturnValue
                 }
 
                 return returnValue!
             }
         }
         set {
             if Thread.isMainThread {
-                declineCallNotificationIdUnderlyingReturnValue = newValue
+                declineCallNotificationIDUnderlyingReturnValue = newValue
             } else {
                 DispatchQueue.main.sync {
-                    declineCallNotificationIdUnderlyingReturnValue = newValue
+                    declineCallNotificationIDUnderlyingReturnValue = newValue
                 }
             }
         }
     }
-    var declineCallNotificationIdClosure: ((String) async -> Result<Void, RoomProxyError>)?
+    var declineCallNotificationIDClosure: ((String) async -> Result<Void, RoomProxyError>)?
 
-    func declineCall(notificationId: String) async -> Result<Void, RoomProxyError> {
-        declineCallNotificationIdCallsCount += 1
-        declineCallNotificationIdReceivedNotificationId = notificationId
+    func declineCall(notificationID: String) async -> Result<Void, RoomProxyError> {
+        declineCallNotificationIDCallsCount += 1
+        declineCallNotificationIDReceivedNotificationID = notificationID
         DispatchQueue.main.async {
-            self.declineCallNotificationIdReceivedInvocations.append(notificationId)
+            self.declineCallNotificationIDReceivedInvocations.append(notificationID)
         }
-        if let declineCallNotificationIdClosure = declineCallNotificationIdClosure {
-            return await declineCallNotificationIdClosure(notificationId)
+        if let declineCallNotificationIDClosure = declineCallNotificationIDClosure {
+            return await declineCallNotificationIDClosure(notificationID)
         } else {
-            return declineCallNotificationIdReturnValue
+            return declineCallNotificationIDReturnValue
         }
     }
     //MARK: - matrixToPermalink
diff --git a/ElementX/Sources/Services/ElementCall/ElementCallService.swift b/ElementX/Sources/Services/ElementCall/ElementCallService.swift
@@ -16,7 +16,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
     private struct CallID: Equatable {
         let callKitID: UUID
         let roomID: String
-        let rtcNotificationId: String?
+        let rtcNotificationID: String?
     }
     
     private let pushRegistry: PKPushRegistry
@@ -94,7 +94,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
         let callID = if let incomingCallID, incomingCallID.roomID == roomID {
             incomingCallID
         } else {
-            CallID(callKitID: UUID(), roomID: roomID, rtcNotificationId: nil)
+            CallID(callKitID: UUID(), roomID: roomID, rtcNotificationID: nil)
         }
         
         incomingCallID = nil
@@ -147,7 +147,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
             return
         }
         
-        guard let rtcNotificationId = payload.dictionaryPayload[ElementCallServiceNotificationKey.rtcNotifyEventId.rawValue] as? String else {
+        guard let rtcNotificationID = payload.dictionaryPayload[ElementCallServiceNotificationKey.rtcNotifyEventID.rawValue] as? String else {
             MXLog.error("Something went wrong, missing rtc notification event identifier for incoming voip call: \(payload)")
             return
         }
@@ -157,7 +157,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
             return
         }
         
-        let callID = CallID(callKitID: UUID(), roomID: roomID, rtcNotificationId: rtcNotificationId)
+        let callID = CallID(callKitID: UUID(), roomID: roomID, rtcNotificationID: rtcNotificationID)
         incomingCallID = callID
         
         let roomDisplayName = payload.dictionaryPayload[ElementCallServiceNotificationKey.roomDisplayName.rawValue] as? String
@@ -287,7 +287,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
     }
     
     private func sendDeclineCallEvent(_ incomingCallID: CallID) async {
-        guard let rtcNotificationId = incomingCallID.rtcNotificationId else {
+        guard let rtcNotificationID = incomingCallID.rtcNotificationID else {
             MXLog.info("No rtc notification event to decline.")
             return
         }
@@ -302,7 +302,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
             return
         }
         
-        _ = await roomProxy.declineCall(notificationId: rtcNotificationId)
+        _ = await roomProxy.declineCall(notificationID: rtcNotificationID)
     }
     
     private func observeIncomingCallRoomInfo() async {
diff --git a/ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift b/ElementX/Sources/Services/ElementCall/ElementCallServiceConstants.swift
@@ -12,7 +12,7 @@ enum ElementCallServiceNotificationKey: String {
     case roomDisplayName
     /// 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
+    case rtcNotifyEventID
 }
 
 let ElementCallServiceNotificationDiscardDelta = 15.0
diff --git a/ElementX/Sources/Services/Room/JoinedRoomProxy.swift b/ElementX/Sources/Services/Room/JoinedRoomProxy.swift
@@ -639,12 +639,12 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {
         ElementCallWidgetDriver(room: room, deviceID: deviceID)
     }
     
-    func declineCall(notificationId: String) async -> Result<Void, RoomProxyError> {
+    func declineCall(notificationID: String) async -> Result<Void, RoomProxyError> {
         do {
-            try await room.declineCall(rtcNotificationEventId: notificationId)
+            try await room.declineCall(rtcNotificationEventId: notificationID)
             return .success(())
         } catch {
-            MXLog.error("Failed to decline rtc notification \(notificationId) with error: \(error)")
+            MXLog.error("Failed to decline rtc notification \(notificationID) with error: \(error)")
             return .failure(.sdkError(error))
         }
     }
diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@@ -169,7 +169,7 @@ protocol JoinedRoomProxyProtocol: RoomProxyProtocol {
     // MARK: - Element Call
     
     func elementCallWidgetDriver(deviceID: String) -> ElementCallWidgetDriverProtocol
-    func declineCall(notificationId: String) async -> Result<Void, RoomProxyError>
+    func declineCall(notificationID: String) async -> Result<Void, RoomProxyError>
     
     // MARK: - Permalinks
     
diff --git a/NSE/Sources/NotificationHandler.swift b/NSE/Sources/NotificationHandler.swift
@@ -126,7 +126,7 @@ class NotificationHandler {
                 return .processedShouldDiscard
             case .callNotify(let notifyType):
                 return await handleCallNotification(notifyType: notifyType,
-                                                    rtcNotifyEventId: event.eventId(),
+                                                    rtcNotifyEventID: event.eventId(),
                                                     timestamp: event.timestamp(),
                                                     roomID: itemProxy.roomID,
                                                     roomDisplayName: itemProxy.roomDisplayName)
@@ -154,7 +154,7 @@ class NotificationHandler {
     /// Handle incoming call notifications.
     /// - Returns: A boolean indicating whether the notification was handled and should now be discarded.
     private func handleCallNotification(notifyType: NotifyType,
-                                        rtcNotifyEventId: String,
+                                        rtcNotifyEventID: String,
                                         timestamp: Timestamp,
                                         roomID: String,
                                         roomDisplayName: String) async -> NotificationProcessingResult {
@@ -209,7 +209,7 @@ class NotificationHandler {
         
         let payload = [ElementCallServiceNotificationKey.roomID.rawValue: roomID,
                        ElementCallServiceNotificationKey.roomDisplayName.rawValue: roomDisplayName,
-                       ElementCallServiceNotificationKey.rtcNotifyEventId.rawValue: rtcNotifyEventId]
+                       ElementCallServiceNotificationKey.rtcNotifyEventID.rawValue: rtcNotifyEventID]
         
         do {
             try await CXProvider.reportNewIncomingVoIPPushPayload(payload)

Original file line number	Diff line number	Diff line change
`@@ -8999,72 +8999,72 @@ class JoinedRoomProxyMock: JoinedRoomProxyProtocol, @unchecked Sendable {`
`8999`	`8999`	`}`
`9000`	`9000`	`//MARK: - declineCall`
`9001`	`9001`
`9002`		`- var declineCallNotificationIdUnderlyingCallsCount = 0`
`9003`		`- var declineCallNotificationIdCallsCount: Int {`
	`9002`	`+ var declineCallNotificationIDUnderlyingCallsCount = 0`
	`9003`	`+ var declineCallNotificationIDCallsCount: Int {`
`9004`	`9004`	`get {`
`9005`	`9005`	`if Thread.isMainThread {`
`9006`		`- return declineCallNotificationIdUnderlyingCallsCount`
	`9006`	`+ return declineCallNotificationIDUnderlyingCallsCount`
`9007`	`9007`	`} else {`
`9008`	`9008`	`var returnValue: Int? = nil`
`9009`	`9009`	`DispatchQueue.main.sync {`
`9010`		`- returnValue = declineCallNotificationIdUnderlyingCallsCount`
	`9010`	`+ returnValue = declineCallNotificationIDUnderlyingCallsCount`
`9011`	`9011`	`}`
`9012`	`9012`
`9013`	`9013`	`return returnValue!`
`9014`	`9014`	`}`
`9015`	`9015`	`}`
`9016`	`9016`	`set {`
`9017`	`9017`	`if Thread.isMainThread {`
`9018`		`- declineCallNotificationIdUnderlyingCallsCount = newValue`
	`9018`	`+ declineCallNotificationIDUnderlyingCallsCount = newValue`
`9019`	`9019`	`} else {`
`9020`	`9020`	`DispatchQueue.main.sync {`
`9021`		`- declineCallNotificationIdUnderlyingCallsCount = newValue`
	`9021`	`+ declineCallNotificationIDUnderlyingCallsCount = newValue`
`9022`	`9022`	`}`
`9023`	`9023`	`}`
`9024`	`9024`	`}`
`9025`	`9025`	`}`
`9026`		`- var declineCallNotificationIdCalled: Bool {`
`9027`		`- return declineCallNotificationIdCallsCount > 0`
	`9026`	`+ var declineCallNotificationIDCalled: Bool {`
	`9027`	`+ return declineCallNotificationIDCallsCount > 0`
`9028`	`9028`	`}`
`9029`		`- var declineCallNotificationIdReceivedNotificationId: String?`
`9030`		`- var declineCallNotificationIdReceivedInvocations: [String] = []`
	`9029`	`+ var declineCallNotificationIDReceivedNotificationID: String?`
	`9030`	`+ var declineCallNotificationIDReceivedInvocations: [String] = []`
`9031`	`9031`
`9032`		`- var declineCallNotificationIdUnderlyingReturnValue: Result<Void, RoomProxyError>!`
`9033`		`- var declineCallNotificationIdReturnValue: Result<Void, RoomProxyError>! {`
	`9032`	`+ var declineCallNotificationIDUnderlyingReturnValue: Result<Void, RoomProxyError>!`
	`9033`	`+ var declineCallNotificationIDReturnValue: Result<Void, RoomProxyError>! {`
`9034`	`9034`	`get {`
`9035`	`9035`	`if Thread.isMainThread {`
`9036`		`- return declineCallNotificationIdUnderlyingReturnValue`
	`9036`	`+ return declineCallNotificationIDUnderlyingReturnValue`
`9037`	`9037`	`} else {`
`9038`	`9038`	`var returnValue: Result<Void, RoomProxyError>? = nil`
`9039`	`9039`	`DispatchQueue.main.sync {`
`9040`		`- returnValue = declineCallNotificationIdUnderlyingReturnValue`
	`9040`	`+ returnValue = declineCallNotificationIDUnderlyingReturnValue`
`9041`	`9041`	`}`
`9042`	`9042`
`9043`	`9043`	`return returnValue!`
`9044`	`9044`	`}`
`9045`	`9045`	`}`
`9046`	`9046`	`set {`
`9047`	`9047`	`if Thread.isMainThread {`
`9048`		`- declineCallNotificationIdUnderlyingReturnValue = newValue`
	`9048`	`+ declineCallNotificationIDUnderlyingReturnValue = newValue`
`9049`	`9049`	`} else {`
`9050`	`9050`	`DispatchQueue.main.sync {`
`9051`		`- declineCallNotificationIdUnderlyingReturnValue = newValue`
	`9051`	`+ declineCallNotificationIDUnderlyingReturnValue = newValue`
`9052`	`9052`	`}`
`9053`	`9053`	`}`
`9054`	`9054`	`}`
`9055`	`9055`	`}`
`9056`		`- var declineCallNotificationIdClosure: ((String) async -> Result<Void, RoomProxyError>)?`
	`9056`	`+ var declineCallNotificationIDClosure: ((String) async -> Result<Void, RoomProxyError>)?`
`9057`	`9057`
`9058`		`- func declineCall(notificationId: String) async -> Result<Void, RoomProxyError> {`
`9059`		`- declineCallNotificationIdCallsCount += 1`
`9060`		`- declineCallNotificationIdReceivedNotificationId = notificationId`
	`9058`	`+ func declineCall(notificationID: String) async -> Result<Void, RoomProxyError> {`
	`9059`	`+ declineCallNotificationIDCallsCount += 1`
	`9060`	`+ declineCallNotificationIDReceivedNotificationID = notificationID`
`9061`	`9061`	`DispatchQueue.main.async {`
`9062`		`- self.declineCallNotificationIdReceivedInvocations.append(notificationId)`
	`9062`	`+ self.declineCallNotificationIDReceivedInvocations.append(notificationID)`
`9063`	`9063`	`}`
`9064`		`- if let declineCallNotificationIdClosure = declineCallNotificationIdClosure {`
`9065`		`- return await declineCallNotificationIdClosure(notificationId)`
	`9064`	`+ if let declineCallNotificationIDClosure = declineCallNotificationIDClosure {`
	`9065`	`+ return await declineCallNotificationIDClosure(notificationID)`
`9066`	`9066`	`} else {`
`9067`		`- return declineCallNotificationIdReturnValue`
	`9067`	`+ return declineCallNotificationIDReturnValue`
`9068`	`9068`	`}`
`9069`	`9069`	`}`
`9070`	`9070`	`//MARK: - matrixToPermalink`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`16`	`16`	`private struct CallID: Equatable {`
`17`	`17`	`let callKitID: UUID`
`18`	`18`	`let roomID: String`
`19`		`- let rtcNotificationId: String?`
	`19`	`+ let rtcNotificationID: String?`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private let pushRegistry: PKPushRegistry`
`@@ -94,7 +94,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`94`	`94`	`let callID = if let incomingCallID, incomingCallID.roomID == roomID {`
`95`	`95`	`incomingCallID`
`96`	`96`	`} else {`
`97`		`- CallID(callKitID: UUID(), roomID: roomID, rtcNotificationId: nil)`
	`97`	`+ CallID(callKitID: UUID(), roomID: roomID, rtcNotificationID: nil)`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`incomingCallID = nil`
`@@ -147,7 +147,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`147`	`147`	`return`
`148`	`148`	`}`
`149`	`149`
`150`		`- guard let rtcNotificationId = payload.dictionaryPayload[ElementCallServiceNotificationKey.rtcNotifyEventId.rawValue] as? String else {`
	`150`	`+ guard let rtcNotificationID = payload.dictionaryPayload[ElementCallServiceNotificationKey.rtcNotifyEventID.rawValue] as? String else {`
`151`	`151`	`MXLog.error("Something went wrong, missing rtc notification event identifier for incoming voip call: \(payload)")`
`152`	`152`	`return`
`153`	`153`	`}`
`@@ -157,7 +157,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`157`	`157`	`return`
`158`	`158`	`}`
`159`	`159`
`160`		`- let callID = CallID(callKitID: UUID(), roomID: roomID, rtcNotificationId: rtcNotificationId)`
	`160`	`+ let callID = CallID(callKitID: UUID(), roomID: roomID, rtcNotificationID: rtcNotificationID)`
`161`	`161`	`incomingCallID = callID`
`162`	`162`
`163`	`163`	`let roomDisplayName = payload.dictionaryPayload[ElementCallServiceNotificationKey.roomDisplayName.rawValue] as? String`
`@@ -287,7 +287,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`private func sendDeclineCallEvent(_ incomingCallID: CallID) async {`
`290`		`- guard let rtcNotificationId = incomingCallID.rtcNotificationId else {`
	`290`	`+ guard let rtcNotificationID = incomingCallID.rtcNotificationID else {`
`291`	`291`	`MXLog.info("No rtc notification event to decline.")`
`292`	`292`	`return`
`293`	`293`	`}`
`@@ -302,7 +302,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe`
`302`	`302`	`return`
`303`	`303`	`}`
`304`	`304`
`305`		`- _ = await roomProxy.declineCall(notificationId: rtcNotificationId)`
	`305`	`+ _ = await roomProxy.declineCall(notificationID: rtcNotificationID)`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`private func observeIncomingCallRoomInfo() async {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ enum ElementCallServiceNotificationKey: String {`
`12`	`12`	`case roomDisplayName`
`13`	`13`	/// When an incoming call is set to ring, there will be a `m.rtc.notification`event (MSC4075).
`14`	`14`	`/// Keep the notification event id as it is needed to decline calls (MSC4310).`
`15`		`- case rtcNotifyEventId`
	`15`	`+ case rtcNotifyEventID`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`let ElementCallServiceNotificationDiscardDelta = 15.0`
Original file line number	Diff line number	Diff line change
`@@ -639,12 +639,12 @@ class JoinedRoomProxy: JoinedRoomProxyProtocol {`
`639`	`639`	`ElementCallWidgetDriver(room: room, deviceID: deviceID)`
`640`	`640`	`}`
`641`	`641`
`642`		`- func declineCall(notificationId: String) async -> Result<Void, RoomProxyError> {`
	`642`	`+ func declineCall(notificationID: String) async -> Result<Void, RoomProxyError> {`
`643`	`643`	`do {`
`644`		`- try await room.declineCall(rtcNotificationEventId: notificationId)`
	`644`	`+ try await room.declineCall(rtcNotificationEventId: notificationID)`
`645`	`645`	`return .success(())`
`646`	`646`	`} catch {`
`647`		`- MXLog.error("Failed to decline rtc notification \(notificationId) with error: \(error)")`
	`647`	`+ MXLog.error("Failed to decline rtc notification \(notificationID) with error: \(error)")`
`648`	`648`	`return .failure(.sdkError(error))`
`649`	`649`	`}`
`650`	`650`	`}`