mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-17 23:18:27 +02:00
MESSENGER-3269 permalink config from appconfig
This commit is contained in:
@@ -79,7 +79,7 @@ class CommonConfiguration: NSObject, Configurable {
|
||||
// Pass threading option to the SDK
|
||||
sdkOptions.enableThreads = RiotSettings.shared.enableThreads
|
||||
|
||||
sdkOptions.clientPermalinkBaseUrl = ServerURLHelper.shared.httpsPermalink()
|
||||
sdkOptions.clientPermalinkBaseUrl = AppConfigService.shared.permalinkUrl()
|
||||
|
||||
sdkOptions.authEnableRefreshTokens = BuildSettings.authEnableRefreshTokens
|
||||
|
||||
|
||||
@@ -480,7 +480,7 @@
|
||||
|
||||
MXSDKOptions *option = MXSDKOptions.sharedInstance;
|
||||
|
||||
option.clientPermalinkBaseUrl = [ServerURLHelper.shared httpsPermalink];
|
||||
option.clientPermalinkBaseUrl = [AppConfigService.shared permalinkUrl];
|
||||
} else {
|
||||
serverUrl = @"";
|
||||
}
|
||||
|
||||
@@ -39,6 +39,7 @@ targets:
|
||||
- path: .
|
||||
- path: ../bwi/SecureStorage
|
||||
- path: ../bwi/ServerURLs
|
||||
- path: ../bwi/AppConfig
|
||||
- path: ../bwi/BwiBuildSettings.swift
|
||||
- path: ../Config/BwiSettings.swift
|
||||
- path: ../Riot/Modules/Common/SegmentedViewController/SegmentedViewController.m
|
||||
|
||||
@@ -22,4 +22,5 @@ struct AppConfig: Codable, Equatable {
|
||||
var serverUrl: String? = nil
|
||||
var contentScannerUrl: String? = nil
|
||||
var pusherUrl: String? = nil
|
||||
var permalinkUrl: String? = nil
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ extension UserDefaults
|
||||
private let serverUrlKey = "serverUrl"
|
||||
private let contentScannerKey = "contentScanner"
|
||||
private let pusherUrlKey = "pusherUrl"
|
||||
private let permalinkUrlKey = "permalinkUrl"
|
||||
|
||||
private let savedConfig = "savedAppConfig"
|
||||
|
||||
@@ -113,6 +114,11 @@ extension UserDefaults
|
||||
config.pusherUrl = pusherUrl
|
||||
}
|
||||
}
|
||||
if let permalinkUrl = dict[permalinkUrlKey] as? String {
|
||||
if checkUrlSavety(permalinkUrl) {
|
||||
config.permalinkUrl = permalinkUrl
|
||||
}
|
||||
}
|
||||
|
||||
if config != appConfig {
|
||||
appConfig = config
|
||||
@@ -148,4 +154,16 @@ extension UserDefaults
|
||||
return BuildSettings.serverConfigSygnalAPIUrlString
|
||||
}
|
||||
}
|
||||
|
||||
func permalinkUrl() -> String {
|
||||
if let url = appConfig.permalinkUrl {
|
||||
return "https://" + url
|
||||
} else if let url = ServerURLHelper.shared.httpsPermalink() {
|
||||
return url
|
||||
} else if let url = BuildSettings.clientPermalinkBaseUrl {
|
||||
return url
|
||||
} else {
|
||||
return ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user