Merge pull request #1006 from tchapgouv/984-geolocalisation-impossibl…

…e-de-partager-sa-geoloc-dans-un-dm-cree-par-lutilisateur Autoriser le partage de localisation dans un salon en se basant sur les niveaux d'autorisation du salon
tchapgouv · May 16, 2024 · 722d5c9 · 722d5c9
2 parents 420d8b4 + e1e073c
commit 722d5c9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/...Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift b/...Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift
@@ -166,17 +166,36 @@ final class LocationSharingCoordinator: Coordinator, Presentable {
 
     // Check if user can send beacon info state event
     private func canShareLiveLocation() -> Bool {
-        guard let myUserId = parameters.roomDataSource.mxSession.myUserId else {
-            return false
-        }
-
-        let userPowerLevelRawValue = parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId)
-
-        guard let userPowerLevel = RoomPowerLevel(rawValue: userPowerLevelRawValue) else {
+        // Tchap: allow live sharing geolocation based on room power levels
+        //
+//        guard let myUserId = parameters.roomDataSource.mxSession.myUserId else {
+//            return false
+//        }
+//        
+//        let userPowerLevelRawValue = parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId)
+//        
+//        guard let userPowerLevel = RoomPowerLevel(rawValue: userPowerLevelRawValue) else {
+//            return false
+//        }
+//        
+//        return userPowerLevel.rawValue >= RoomPowerLevel.moderator.rawValue
+
+        guard let myUserId = parameters.roomDataSource.mxSession.myUserId,
+              let roomPowerLevels = parameters.roomDataSource.roomState.powerLevels,
+              let userPowerLevel = RoomPowerLevel(rawValue: parameters.roomDataSource.roomState.powerLevels.powerLevelOfUser(withUserID: myUserId)) else {
             return false
         }
 
-        return userPowerLevel.rawValue >= RoomPowerLevel.moderator.rawValue
+        // Tchap: should call `minimumPowerLevelForSendingStateEvent(_ eventType: MXEventType) -> Int` from `MatrixSDK:MXRoomPowerLevels.swift`
+        // but can't because it is inaccessible due to 'internal' protection level
+        //
+        // let liveSharingPowerLevel = parameters.roomDataSource.roomState.powerLevels.minimumPowerLevelForSendingStateEvent(.beaconInfo)
+        //
+
+        // Get live sharing power level from stable value, then unstable value and fallback on default value.
+        let liveSharingPowerLevel = (roomPowerLevels.events[kMXEventTypeStringBeaconInfo] ?? roomPowerLevels.events[kMXEventTypeStringBeaconInfoMSC3672]) as? Int ?? roomPowerLevels.stateDefault
+
+        return userPowerLevel.rawValue >= liveSharingPowerLevel
     }
 
     private func showLabFlagPromotionIfNeeded(completion: @escaping ((Bool) -> Void)) {

diff --git a/changelog.d/984.change b/changelog.d/984.change
@@ -0,0 +1 @@
+Autoriser le partage de localisation dans un salon en se basant sur les niveaux d'autorisation du salon