From 17ca81e5ecaaef9839c8c85fb6039df79ef5d0a5 Mon Sep 17 00:00:00 2001 From: Arnfried Griesert Date: Mon, 28 Aug 2023 08:43:51 +0000 Subject: [PATCH] Feature/fix huddle power levels --- Podfile | 2 +- bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index b32abf6da..4485d490e 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc1' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc3' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m b/bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m index 6a46d5f35..c465dea43 100644 --- a/bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m +++ b/bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m @@ -40,9 +40,18 @@ NSMutableDictionary *eventContent = [NSMutableDictionary dictionaryWithDictionary:roomState.powerLevels.JSONDictionary]; NSMutableDictionary *eventPowerLevels = [NSMutableDictionary dictionaryWithDictionary:eventContent[@"events"]]; + + // Element defined event power levels eventPowerLevels[@"m.room.name"] = [NSNumber numberWithInteger:powerLevelGeneral]; eventPowerLevels[@"m.room.topic"] = [NSNumber numberWithInteger:powerLevelGeneral]; eventPowerLevels[@"m.room.avatar"] = [NSNumber numberWithInteger:powerLevelGeneral]; + + // bwi: 5035 - huddle power levels should stay at power level 0 (all users) + eventPowerLevels[@"m.call"] = [NSNumber numberWithInteger:0]; + eventPowerLevels[@"m.call.member"] = [NSNumber numberWithInteger:0]; + eventPowerLevels[@"org.matrix.msc3401.call"] = [NSNumber numberWithInteger:0]; + eventPowerLevels[@"org.matrix.msc3401.call.member"] = [NSNumber numberWithInteger:0]; + eventContent[@"events"] = eventPowerLevels; eventContent[@"invite"] = [NSNumber numberWithInteger:powerLevelInvite]; @@ -51,12 +60,6 @@ eventContent[@"redact"] = [NSNumber numberWithInteger:powerLevelRedact]; eventContent[@"events_default"] = [NSNumber numberWithInteger:powerLevelSend]; - // bwi: 5035 - huddle power levels should stay at power level 0 (all users) - eventContent[@"m.call"] = [NSNumber numberWithInteger:0]; - eventContent[@"m.call.member"] = [NSNumber numberWithInteger:0]; - eventContent[@"org.matrix.msc3401.call"] = [NSNumber numberWithInteger:0]; - eventContent[@"org.matrix.msc3401.call.member"] = [NSNumber numberWithInteger:0]; - // Make the request to the HS MXHTTPOperation *_operation = [self sendStateEventOfType:kMXEventTypeStringRoomPowerLevels content:eventContent stateKey:nil success:^(NSString *eventId) { success();