MESSENGER-3269 permalink config from appconfig

This commit is contained in:
Frank Rotermund
2022-06-21 13:47:35 +02:00
parent 22512343cb
commit 9e0f3de20c
5 changed files with 22 additions and 2 deletions

View File

@@ -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

View File

@@ -480,7 +480,7 @@
MXSDKOptions *option = MXSDKOptions.sharedInstance;
option.clientPermalinkBaseUrl = [ServerURLHelper.shared httpsPermalink];
option.clientPermalinkBaseUrl = [AppConfigService.shared permalinkUrl];
} else {
serverUrl = @"";
}

View File

@@ -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

View File

@@ -22,4 +22,5 @@ struct AppConfig: Codable, Equatable {
var serverUrl: String? = nil
var contentScannerUrl: String? = nil
var pusherUrl: String? = nil
var permalinkUrl: String? = nil
}

View File

@@ -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 ""
}
}
}