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

Enable nilability on Jitsi server URL

Browse Source
This commit is contained in:
aringenbach
2022-03-21 15:18:47 +01:00
parent 79ce5b3378
commit 5d73b50bf9
7 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/HomeserverConfiguration/HomeserverConfigurationBuilder.swift
+4 -7
View File
@@ -54,18 +54,15 @@ final class HomeserverConfigurationBuilder: NSObject {
secureBackupSetupMethods: secureBackupSetupMethods)
// Jitsi configuration
let jitsiPreferredDomain: String
let jitsiServerURL: URL
let hardcodedJitsiServerURL: URL = BuildSettings.jitsiServerUrl
let jitsiPreferredDomain: String?
let jitsiServerURL: URL?
let hardcodedJitsiServerURL: URL? = BuildSettings.jitsiServerUrl
if let preferredDomain = vectorWellKnownJitsiConfiguration?.preferredDomain {
jitsiPreferredDomain = preferredDomain
jitsiServerURL = self.jitsiServerURL(from: preferredDomain) ?? hardcodedJitsiServerURL
} else {
guard let hardcodedJitsiDomain = hardcodedJitsiServerURL.host else {
fatalError("[HomeserverConfigurationBuilder] Fail to get Jitsi domain from hardcoded Jitsi URL")
}
jitsiPreferredDomain = hardcodedJitsiDomain
jitsiPreferredDomain = hardcodedJitsiServerURL?.host
jitsiServerURL = hardcodedJitsiServerURL
}
Riot/Model/HomeserverConfiguration/HomeserverJitsiConfiguration.swift
+3 -3
View File
@@ -19,10 +19,10 @@ import Foundation
/// `HomeserverJitsiConfiguration` gives Jitsi widget configuration used by homeserver
@objcMembers
final class HomeserverJitsiConfiguration: NSObject {
let serverDomain: String
let serverURL: URL
let serverDomain: String?
let serverURL: URL?
init(serverDomain: String, serverURL: URL) {
init(serverDomain: String?, serverURL: URL?) {
self.serverDomain = serverDomain
self.serverURL = serverURL