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

Merge branch 'master' into feature/5254_merge_element_into_bum

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
This commit is contained in:
Arnfried Griesert
2023-10-22 18:57:22 +02:00
parent 11f20de449 d3785e2343
commit 54aca03fc4
21 changed files with 195 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift
+4 -1
View File
@@ -74,6 +74,8 @@ final class HomeserverConfigurationBuilder: NSObject {
jitsiServerURL = hardcodedJitsiServerURL
}
let useJitsiFor1To1Calls = vectorWellKnownJitsiConfiguration?.useFor1To1Calls
// Tile server configuration
@@ -91,7 +93,8 @@ final class HomeserverConfigurationBuilder: NSObject {
// Create HomeserverConfiguration
let jitsiConfiguration = HomeserverJitsiConfiguration(serverDomain: jitsiPreferredDomain,
serverURL: jitsiServerURL)
serverURL: jitsiServerURL,
useFor1To1Calls: useJitsiFor1To1Calls)
return HomeserverConfiguration(jitsi: jitsiConfiguration,
encryption: encryptionConfiguration,
Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift
+3 -1
View File
@@ -21,10 +21,12 @@ import Foundation
final class HomeserverJitsiConfiguration: NSObject {
let serverDomain: String?
let serverURL: URL?
let useFor1To1Calls: Bool
init(serverDomain: String?, serverURL: URL?) {
init(serverDomain: String?, serverURL: URL?, useFor1To1Calls: Bool?) {
self.serverDomain = serverDomain
self.serverURL = serverURL
self.useFor1To1Calls = useFor1To1Calls ?? false
super.init()
}