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

Merge branch 'feature/6152_fix_app_crashes_mute_function' into 'develop'

Browse Source 
MESSENGER-6152 fix app crashes mute function and invite

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!375
This commit is contained in:
JanNiklas Grabowski
2024-06-06 12:40:04 +00:00
parent 09bc89b872 12b9a4626e
commit b1759a5607
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ import MatrixSDK
// Federation status for room, "isFederated" flag + serverACL
func getFederationStatus(completion: ((_ isFederated:Bool) -> Void)?) {
// #5715 do not show federation for invites
if (summary.membership == .invite) {
if (summary != nil && summary.membership == .invite) {
completion?(false)
} else {
var federationStatus = true
@@ -34,10 +34,12 @@ import MatrixSDK
// Check Server ACLs
self.getCurrentRoomServerACLSettings { serverACL in
if let serverACL = serverACL {
let myUserId = self.mxSession.myUser.userId ?? ""
let myUserIdComponents = myUserId.components(separatedBy: ":")
if serverACL != "*" && myUserIdComponents.count == 2 && serverACL == myUserIdComponents.last ?? "" {
federationStatus = false
if self.mxSession != nil && self.mxSession.myUser != nil {
let myUserId = self.mxSession.myUser.userId ?? ""
let myUserIdComponents = myUserId.components(separatedBy: ":")
if serverACL != "*" && myUserIdComponents.count == 2 && serverACL == myUserIdComponents.last ?? "" {
federationStatus = false
}
}
}
completion?(federationStatus)
@@ -54,12 +56,14 @@ import MatrixSDK
var isFederated: Bool = false
// Check if the user is from the same homeserver
if let memberUserId = self.directUserId {
if let myUserId = self.mxSession.myUser.userId {
let memberUserIdComponents = memberUserId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if memberUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& memberUserIdComponents.last != myUserIdComponents.last {
isFederated = true
if self.mxSession != nil && self.mxSession.myUser != nil {
if let myUserId = self.mxSession.myUser.userId {
let memberUserIdComponents = memberUserId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if memberUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& memberUserIdComponents.last != myUserIdComponents.last {
isFederated = true
}
}
}
}
@@ -80,12 +84,14 @@ import MatrixSDK
func isRoomMemberFederated(_ userId: String) -> Bool {
var isFederated: Bool = false
// Check if the user is from the same homeserver
if let myUserId = self.mxSession.myUser.userId {
let memberUserIdComponents = userId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if memberUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& memberUserIdComponents.last != myUserIdComponents.last {
isFederated = true
if self.mxSession != nil && self.mxSession.myUser != nil {
if let myUserId = self.mxSession.myUser.userId {
let memberUserIdComponents = userId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if memberUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& memberUserIdComponents.last != myUserIdComponents.last {
isFederated = true
}
}
}
return isFederated
@@ -95,12 +101,14 @@ import MatrixSDK
func amiFederated() -> Bool {
var isFederated: Bool = false
// Check if the room is from the same homeserver
if let myUserId = self.mxSession.myUser.userId {
let roomUserIdComponents = self.roomId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if roomUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& roomUserIdComponents.last != myUserIdComponents.last {
isFederated = true
if self.mxSession != nil && self.mxSession.myUser != nil {
if let myUserId = self.mxSession.myUser.userId {
let roomUserIdComponents = self.roomId.components(separatedBy: ":")
let myUserIdComponents = myUserId.components(separatedBy: ":")
if roomUserIdComponents.count == 2 && myUserIdComponents.count == 2
&& roomUserIdComponents.last != myUserIdComponents.last {
isFederated = true
}
}
}
return isFederated