Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Autoriser le partage de localisation dans un salon en se basant sur les niveaux d'autorisation du salon #1006

Merged
merged 3 commits into from
May 16, 2024
Merged

Autoriser le partage de localisation dans un salon en se basant sur les niveaux d'autorisation du salon #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85147e7
Autoriser le partage de localisation de la part d'un invité dans un M…
Apr 3, 2024
db5beb5
Use Room power levels to check if user can post live sharing location…
May 16, 2024
e1e073c
Check with Stable then Unstable event keys
May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions ...Modules/LocationSharing/StartLocationSharing/Coordinator/LocationSharingCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
1 change: 1 addition & 0 deletions changelog.d/984.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Autoriser le partage de localisation dans un salon en se basant sur les niveaux d'autorisation du salon
Loading