Merge pull request #940 from tchapgouv/936-activer-les-appels-audio-s…

…ur-mobile-pour-les-users-dinum-ios Activer les appels audio sur mobile pour les users dinum ios
tchapgouv · Jan 23, 2024 · 439b276 · 439b276
2 parents 81be1c7 + afd6e7e
commit 439b276
Show file tree

Hide file tree

Showing 21 changed files with 501 additions and 457 deletions.
diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift
@@ -321,7 +321,7 @@ final class BuildSettings: NSObject {
     // MARK: - Room Screen
 
     static let roomScreenAllowVoIPForDirectRoom: Bool = true
-    static let roomScreenAllowVoIPForNonDirectRoom: Bool = true
+    static let roomScreenAllowVoIPForNonDirectRoom: Bool = false // Tchap: no Voip in non-direct rooms.
     static let roomScreenAllowCameraAction: Bool = true
     static let roomScreenAllowMediaLibraryAction: Bool = true
     static let roomScreenAllowStickerAction: Bool = false

diff --git a/Config/AppConfiguration.swift b/Config/AppConfiguration.swift
@@ -27,8 +27,7 @@ class AppConfiguration: CommonConfiguration {
     }
 
     private func setupAppSettings() {
-        // Tchap: Disable CallKit.
-        MXKAppSettings.standard()?.isCallKitEnabled = false
+        MXKAppSettings.standard()?.isCallKitEnabled = true
 
         // Get additional events (modular widget, voice broadcast...)
         MXKAppSettings.standard()?.addSupportedEventTypes([kWidgetMatrixEventTypeString,

diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -332,7 +332,7 @@ final class BuildSettings: NSObject {
     // MARK: - Room Screen
 
     static let roomScreenAllowVoIPForDirectRoom: Bool = true
-    static let roomScreenAllowVoIPForNonDirectRoom: Bool = true
+    static let roomScreenAllowVoIPForNonDirectRoom: Bool = false // Tchap: no Voip in non-direct rooms.
     static let roomScreenAllowCameraAction: Bool = true
     static let roomScreenAllowMediaLibraryAction: Bool = true
     static let roomScreenAllowStickerAction: Bool = true

diff --git a/DevTchap/Config/BuildSettings.swift b/DevTchap/Config/BuildSettings.swift
@@ -322,7 +322,7 @@ final class BuildSettings: NSObject {
     // MARK: - Room Screen
 
     static let roomScreenAllowVoIPForDirectRoom: Bool = true
-    static let roomScreenAllowVoIPForNonDirectRoom: Bool = true
+    static let roomScreenAllowVoIPForNonDirectRoom: Bool = false // Tchap: no Voip in non-direct rooms.
     static let roomScreenAllowCameraAction: Bool = true
     static let roomScreenAllowMediaLibraryAction: Bool = true
     static let roomScreenAllowStickerAction: Bool = false

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é";
+"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_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/Managers/PushNotification/PushNotificationService.m b/Riot/Managers/PushNotification/PushNotificationService.m
@@ -135,11 +135,10 @@ - (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 
     _isPushRegistered = YES;
 
-    // Tchap: Do not configure pushKit for the moment
-//    if (!_pushNotificationStore.pushKitToken)
-//    {
-//        [self configurePushKit];
-//    }
+    if (!_pushNotificationStore.pushKitToken)
+    {
+        [self configurePushKit];
+    }
 
     if (self.registrationForRemoteNotificationsCompletion)
     {
@@ -652,9 +651,8 @@ - (void)pushRegistry:(PKPushRegistry *)registry didReceiveIncomingPushWithPayloa
             else if ([callInvite.type isEqualToString:kWidgetMatrixEventTypeString] ||
                      [callInvite.type isEqualToString:kWidgetModularEventTypeString])
             {
-                // TODO: Tchap: VoIP support
-//                [[AppDelegate theDelegate].callPresenter processWidgetEvent:callInvite
-//                                                                  inSession:session];
+                [[AppDelegate theDelegate].callPresenter processWidgetEvent:callInvite
+                                                                  inSession:session];
             }
             else
             {

diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -87,7 +87,7 @@
 NSString *const kLegacyAppDelegateDidLogoutNotification = @"kLegacyAppDelegateDidLogoutNotification";
 NSString *const kLegacyAppDelegateDidLoginNotification = @"kLegacyAppDelegateDidLoginNotification";
 
-@interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, PushNotificationServiceDelegate, SetPinCoordinatorBridgePresenterDelegate/*, CallPresenterDelegate, SpaceDetailPresenterDelegate, SecureBackupSetupCoordinatorBridgePresenterDelegate*/>
+@interface LegacyAppDelegate () <GDPRConsentViewControllerDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, PushNotificationServiceDelegate, SetPinCoordinatorBridgePresenterDelegate, CallPresenterDelegate/*, SpaceDetailPresenterDelegate, SecureBackupSetupCoordinatorBridgePresenterDelegate*/>
 {
     /**
      Reachability observer
@@ -485,9 +485,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
 
-    // Tchap: Disable Calls
-//    self.callPresenter = [[CallPresenter alloc] init];
-//    self.callPresenter.delegate = self;
+    self.callPresenter = [[CallPresenter alloc] init];
+    self.callPresenter.delegate = self;
 
     self.pushNotificationStore = [PushNotificationStore new];
     self.pushNotificationService = [[PushNotificationService alloc] initWithPushNotificationStore:self.pushNotificationStore];
@@ -1982,8 +1981,7 @@ - (void)initMatrixSessions
         else if (mxSession.state == MXSessionStateStoreDataReady)
         {
             //  start the call service
-            // Tchap: Disable Calls
-//            [self.callPresenter start];
+            [self.callPresenter start];
 
             // Register to user new device sign in notification
             [self registerUserDidSignInOnNewDeviceNotificationForSession:mxSession];
@@ -2157,8 +2155,7 @@ - (void)addMatrixSession:(MXSession *)mxSession
         [[WidgetManager sharedManager] addMatrixSession:mxSession];
 
         // register the session to the call service
-        // Tchap: Disable Calls
-//        [_callPresenter addMatrixSession:mxSession];
+        [_callPresenter addMatrixSession:mxSession];
 
         // Tchap: Disable UISI
         // register the session to the uisi auto-reporter
@@ -2182,8 +2179,7 @@ - (void)removeMatrixSession:(MXSession*)mxSession
     [[MXKContactManager sharedManager] removeMatrixSession:mxSession];
 
     // remove session from the call service
-    // Tchap: Disable Calls
-    //    [_callPresenter removeMatrixSession:mxSession];
+    [_callPresenter removeMatrixSession:mxSession];
 
     // register the session to the uisi auto-reporter
     // Tchap: Disable UISI
@@ -2207,8 +2203,7 @@ - (void)removeMatrixSession:(MXSession*)mxSession
     if (!mxSessionArray.count)
     {
         //  if no session left, stop the call service
-        // Tchap: Disable Calls
-//        [self.callPresenter stop];
+        [self.callPresenter stop];
     }
 
     [self.delegate legacyAppDelegate:self didRemoveMatrixSession:mxSession];