Merge pull request #969 from tchapgouv/968-activer-le-notifications-f…

…iltering 968 activer le notifications filtering
tchapgouv · Feb 26, 2024 · bf68932 · bf68932
2 parents c8b71c3 + 09be578
commit bf68932
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 30 deletions.
diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 2.7.1
+MARKETING_VERSION = 2.7.2
 CURRENT_PROJECT_VERSION = 1
diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings
@@ -1465,7 +1465,7 @@
 
 "voice_message_release_to_send" = "Maintenir pour enregistrer, relâcher pour envoyer";
 "event_formatter_call_missed_video" = "Appel vidéo manqué";
-"event_formatter_call_missed_voice" = "Appel audio manqué\n\nActuellement sur iOS, vous ne pouvez que passer des appels et pas en recevoir."; // Tchap: temporary fix for VoIP beta-test
+"event_formatter_call_missed_voice" = "Appel audio manqué";
 "event_formatter_call_active_video" = "Appel vidéo en cours";
 "event_formatter_call_active_voice" = "Appel audio en cours";
 "event_formatter_call_incoming_video" = "Appel vidéo entrant";

diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
@@ -1442,10 +1442,7 @@ - (void)updateProximityAndSleep
      // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
      // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
      BOOL disableIdleTimer = inCall && (mxCall.isVideoCall || isBuiltInReceiverUsed);
-
-     // Tchap: force disable the idle timer when in call, let it be a video call or a voice call with the built-in receiver, built-in speaker or a bluetooth device.
-     disableIdleTimer = inCall;
-
+
      UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
      if (sharedApplication && sharedApplication.isIdleTimerDisabled != disableIdleTimer)
      {

diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift
@@ -16,6 +16,7 @@
 
 import UserNotifications
 import MatrixSDK
+import CallKit
 
 /// The number of milliseconds in one second.
 private let MSEC_PER_SEC: TimeInterval = 1000
@@ -831,29 +832,47 @@ class NotificationService: UNNotificationServiceExtension {
 
         ongoingVoIPPushRequests[event.eventId] = true
 
-        let appId = BuildSettings.pushKitAppId
-
-        pushGatewayRestClient.notifyApp(withId: appId,
-                                        pushToken: token,
-                                        eventId: event.eventId,
-                                        roomId: event.roomId,
-                                        eventType: nil,
-                                        sender: event.sender,
-                                        timeout: NSE.Constants.voipPushRequestTimeout,
-                                        success: { [weak self] (rejected) in
-                                            MXLog.debug("[NotificationService] sendVoipPush succeeded, rejected tokens: \(rejected)")
-
-                                            guard let self = self else { return }
-                                            self.ongoingVoIPPushRequests.removeValue(forKey: event.eventId)
-
-                                            self.fallbackToBestAttemptContent(forEventId: event.eventId)
-                                        }) { [weak self] (error) in
-            MXLog.debug("[NotificationService] sendVoipPush failed with error: \(error)")
-
-            guard let self = self else { return }
-            self.ongoingVoIPPushRequests.removeValue(forKey: event.eventId)
-
-            self.fallbackToBestAttemptContent(forEventId: event.eventId)
+        // Tchap: report incoming VoIP notification directly to application
+        // rather than requesting Sygnal to resend unencrypted VoIP notification
+
+//        let appId = BuildSettings.pushKitAppId
+//        
+//        pushGatewayRestClient.notifyApp(withId: appId,
+//                                        pushToken: token,
+//                                        eventId: event.eventId,
+//                                        roomId: event.roomId,
+//                                        eventType: nil,
+//                                        sender: event.sender,
+//                                        timeout: NSE.Constants.voipPushRequestTimeout,
+//                                        success: { [weak self] (rejected) in
+//                                            MXLog.debug("[NotificationService] sendVoipPush succeeded, rejected tokens: \(rejected)")
+//                                            
+//                                            guard let self = self else { return }
+//                                            self.ongoingVoIPPushRequests.removeValue(forKey: event.eventId)
+//                                            
+//                                            self.fallbackToBestAttemptContent(forEventId: event.eventId)
+//                                        }) { [weak self] (error) in
+//            MXLog.debug("[NotificationService] sendVoipPush failed with error: \(error)")
+//            
+//            guard let self = self else { return }
+//            self.ongoingVoIPPushRequests.removeValue(forKey: event.eventId)
+//            
+//            self.fallbackToBestAttemptContent(forEventId: event.eventId)
+//        }
+
+        // Starting from iOS 14.5, SDK can "Reports a new incoming call after your notification service extension decrypts a VoIP call request."
+         // See: https://developer.apple.com/documentation/callkit/cxprovider/3727263-reportnewincomingvoippushpayload
+
+        // Build th payload expected by the application.
+        var payload = [String: String]()
+        payload["event_id"] = event.eventId
+        payload["room_id"] = event.roomId
+
+        // Send the unencrypted VoIP payload dirtectly to the application.
+        CXProvider.reportNewIncomingVoIPPushPayload(payload) { error in
+            if let error = error {
+                MXLog.debug("[NotificationService] reportNewIncomingVoIPPushPayload Error: \(error)")
+            }
         }
     }
 

diff --git a/RiotNSE/RiotNSE.entitlements b/RiotNSE/RiotNSE.entitlements
@@ -6,6 +6,8 @@
 	<array>
 		<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
 	</array>
+	<key>com.apple.developer.usernotifications.filtering</key>
+	<true/>
 	<key>keychain-access-groups</key>
 	<array>
 		<string>$(KEYCHAIN_ACCESS_GROUP)</string>

diff --git a/changelog.d/968.change b/changelog.d/968.change
@@ -0,0 +1 @@
+Réception des appels VoIP même si l'application n'est pas lancée ou pas en premier plan.
diff --git a/towncrier.toml b/towncrier.toml
@@ -1,6 +1,6 @@
 [tool.towncrier]
 name = "Changes in"
-version = "2.7.1"
+version = "2.7.2"
 filename = "TCHAP_CHANGES.md"
 directory = "changelog.d"
 template = "changelog.d/_template.md.jinja"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Réception des appels VoIP même si l'application n'est pas lancée ou pas en premier plan.