felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor set serveracl and fix json key

Browse Source
This commit is contained in:
JanNiklas Grabowski
2024-01-26 13:25:27 +01:00
parent 65864cc1ab
commit 56c544797d
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Riot/Modules/Room/Settings/RoomSettingsViewController.m
View File

@@ -1708,10 +1708,8 @@ BOOL reloadToggleCell = false;
NSString *serverACLRule = updatedItemsDict[kRoomSettingsFederationKey];
if (serverACLRule)
{
NSMutableDictionary *content = [[NSMutableDictionary alloc] initWithDictionary:@{
@"allow": @[serverACLRule],
@"allowIPLiterals" : @false
}];
NSDictionary *content = [mxRoom createServerACLContentWithServerACL:serverACLRule];
pendingOperation = [mxRoom sendStateEventOfType:kMXEventTypeStringRoomServerACL content:content stateKey:nil success:^(NSString *eventId) {
if (weakSelf)

28
bwi/Federation/MXRoom+Federation.swift
View File

@@ -117,4 +117,32 @@ import MatrixSDK
}
}
}
// Create map for content json with boolean
func createServerACL(isFederated: Bool) -> [String:Any] {
var serverACL: String = ""
if isFederated {
serverACL = "*"
} else {
if let myUserIDComponents = self.mxSession.myUserId?.components(separatedBy: ":")
{
if myUserIDComponents.count == 2 {
serverACL = myUserIDComponents[1]
}
}
}
return createServerACLContent(serverACL: serverACL)
}
// Create map for content json with serverACL string
func createServerACLContent(serverACL: String) -> [String:Any] {
var content: [String:Any] = [String:Any]()
var serverACLList: [String] = [String]()
serverACLList.append(serverACL)
content.updateValue(serverACLList, forKey: "allow")
content.updateValue(false, forKey: "allow_ip_literals")
return content
}
}

16
bwi/Federation/UI/RoomFederationDecisionView.swift
View File

@@ -161,21 +161,7 @@ struct RoomFederationDecisionView: View {
func setServerACL(isFederated: Bool) {
var serverACL: [String] = [String]()
if isFederated {
serverACL.append("*")
} else {
if let myUserIDComponents = room.mxSession.myUserId?.components(separatedBy: ":")
{
if myUserIDComponents.count == 2 {
serverACL.append(myUserIDComponents[1])
}
}
}
var content: [String:Any] = [String:Any]()
content.updateValue(serverACL, forKey: "allow")
content.updateValue(false, forKey: "allowIPLiterals")
let content: [String:Any] = room.createServerACL(isFederated: isFederated)
isUpdatingServerACLs = true
pendingRequest = room.sendStateEvent(MXEventType.roomServerACL, content: content, stateKey: "") { response in
isUpdatingServerACLs = false