Merge pull request #958 from tchapgouv/957-utiliser-les-feature-flags…

…-pour-activer-la-voip-pour-dinum-seulement 957 utiliser les feature flags pour activer la voip pour dinum seulement
tchapgouv · Jan 23, 2024 · 2b9d76c · 2b9d76c
2 parents 439b276 + d0561d0
commit 2b9d76c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 29 deletions.
diff --git a/Btchap/Config/BuildSettings.swift b/Btchap/Config/BuildSettings.swift
@@ -237,7 +237,7 @@ final class BuildSettings: NSObject {
     static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail"
     static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP"
     static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP"    // Tchap: in pre-prod, allow any feature to any instance.
-    static var tchapFeatureByHomeServer: [String: [String]] = [
+    static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [
         tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ]
     ]
 

diff --git a/DevTchap/Config/BuildSettings.swift b/DevTchap/Config/BuildSettings.swift
@@ -238,7 +238,7 @@ final class BuildSettings: NSObject {
     static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail"
     static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP"
     static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP"    // Tchap: in Dev, allow any feature to any instance.
-    static var tchapFeatureByHomeServer: [String: [String]] = [
+    static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [
         tchapFeatureAnyFeature: [ tchapFeatureAnyHomeServer ]
     ]
 

diff --git a/Riot/Modules/Room/RoomDisplayConfiguration.swift b/Riot/Modules/Room/RoomDisplayConfiguration.swift
@@ -27,20 +27,13 @@ class RoomDisplayConfiguration: NSObject {
         guard _tchapCallsEnabled,
               let account = MXKAccountManager.shared().activeAccounts.first
         else { return false }
-        // Tchap: allow VoIP for Pre-prod and Dev version
-        if ["fr.gouv.btchap", "fr.gouv.tchap.dev"].contains(BuildSettings.baseBundleIdentifier)
-        {
+        // Tchap: actually, only allow VoIP for DINUM homeServer.
+        if (account.isFeatureActivated(BuildSettings.tchapFeatureVoiceOverIP) || account.isFeatureActivated(BuildSettings.tchapFeatureVideoOverIP)) {
             return true
         }
-        // Tchap: actually, only allow VoIP for DINUM homeServer.
-        let allowedHomeServersForCalls = ["agent.dinum.tchap.gouv.fr"]
-        guard let currentHomeServerName = account.mxSession.credentials.homeServerName() else {
+        else {
             return false
         }
-        let callsAreEnabled = allowedHomeServersForCalls.firstIndex {
-            currentHomeServerName.hasSuffix($0)
-        } != nil
-        return callsAreEnabled
     }
 
     let integrationsEnabled: Bool

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -1955,20 +1955,27 @@ - (void)refreshRoomTitle
                     && self.roomDataSource.room.isDirect
                     && !self.mainSession.vc_homeserverConfiguration.jitsi.useFor1To1Calls)
                 {
-                    //  voice call button for Matrix call
-                    UIBarButtonItem *itemVoice = [[UIBarButtonItem alloc] initWithImage:AssetImages.voiceCallHangonIcon.image
-                                                                                  style:UIBarButtonItemStylePlain
-                                                                                 target:self
-                                                                                 action:@selector(onVoiceCallPressed:)];
-                    itemVoice.accessibilityLabel = [VectorL10n roomAccessibilityCall];
-                    itemVoice.enabled = !self.isCallActive;
-                    [rightBarButtonItems addObject:itemVoice];
+                    MXKAccount *account = MXKAccountManager.sharedManager.activeAccounts.firstObject;
 
-                    //  video call button for Matrix call
-// Tchap: Disable video call actually
-//                    UIBarButtonItem *itemVideo = [self videoCallBarButtonItem];
-//                    itemVideo.enabled = !self.isCallActive;
-//                    [rightBarButtonItems addObject:itemVideo];
+                    if (account != nil && [account isFeatureActivated:BuildSettings.tchapFeatureVoiceOverIP])
+                    {
+                        //  voice call button for Matrix call
+                        UIBarButtonItem *itemVoice = [[UIBarButtonItem alloc] initWithImage:AssetImages.voiceCallHangonIcon.image
+                                                                                      style:UIBarButtonItemStylePlain
+                                                                                     target:self
+                                                                                     action:@selector(onVoiceCallPressed:)];
+                        itemVoice.accessibilityLabel = [VectorL10n roomAccessibilityCall];
+                        itemVoice.enabled = !self.isCallActive;
+                        [rightBarButtonItems addObject:itemVoice];
+                    }
+
+                    if (account != nil && [account isFeatureActivated:BuildSettings.tchapFeatureVideoOverIP])
+                    {
+                        //  video call button for Matrix call
+                        UIBarButtonItem *itemVideo = [self videoCallBarButtonItem];
+                        itemVideo.enabled = !self.isCallActive;
+                        [rightBarButtonItems addObject:itemVideo];
+                    }
                 }
                 else
                 {

diff --git a/Tchap/Config/BuildSettings.swift b/Tchap/Config/BuildSettings.swift
@@ -267,10 +267,17 @@ final class BuildSettings: NSObject {
     static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail"
     static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP"
     static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP"
-    static var tchapFeatureByHomeServer: [String: [String]] = [
+    static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [
         tchapFeatureNotificationByEmail: [
             "agent.dinum.tchap.gouv.fr"
+        ],
+        tchapFeatureVoiceOverIP: [
+            "agent.dinum.tchap.gouv.fr"
         ]
+        // No activation of video calls actually in Tchap Production.
+//        tchapFeatureVideoOverIP: [
+//            "agent.dinum.tchap.gouv.fr"
+//        ],
     ]
 
     // MARK: - Side Menu

diff --git a/Tchap/Extensions/Account+Tchap.swift b/Tchap/Extensions/Account+Tchap.swift
@@ -19,11 +19,11 @@ import Foundation
 @objc extension MXKAccount {
 
     func isFeatureActivated(_ featureId: String) -> Bool {
-        guard let targetedFeature = BuildSettings.tchapFeatureByHomeServer[featureId] ?? BuildSettings.tchapFeatureByHomeServer[BuildSettings.tchapFeatureAnyFeature] else {
+        guard let allowedHomeServers = BuildSettings.tchapFeaturesAllowedHomeServersForFeature[featureId] ?? BuildSettings.tchapFeaturesAllowedHomeServersForFeature[BuildSettings.tchapFeatureAnyFeature] else {
             return false
         }
 
-        if targetedFeature.contains(BuildSettings.tchapFeatureAnyHomeServer) {
+        if allowedHomeServers.contains(BuildSettings.tchapFeatureAnyHomeServer) {
             return true
         }
 
@@ -33,6 +33,6 @@ import Foundation
 
         let homeServerDomain = homeServerURL.replacingOccurrences(of: BuildSettings.serverUrlPrefix, with: "")
 
-        return targetedFeature.contains(homeServerDomain)
+        return allowedHomeServers.contains(homeServerDomain)
     }
 }
diff --git a/changelog.d/957.change b/changelog.d/957.change
@@ -0,0 +1 @@
+Utiliser les Features Flags pour activer la VoIP pour la Dinum
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Utiliser les Features Flags pour activer la VoIP pour la Dinum