Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crypto v2 config

Browse source
This commit is contained in:
Andy Uhnak 2023-02-01 11:49:16 +00:00
parent 4ae6061e01
commit 8184832c40
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Config/AppConfiguration.swift
View file

@ -24,9 +24,6 @@ class AppConfiguration: CommonConfiguration {
override func setupSettings() {
super.setupSettings()
setupAppSettings()
#if DEBUG
CryptoSDKConfiguration.shared.setup()
#endif
}
private func setupAppSettings() {

10
Config/CommonConfiguration.swift
View file

@ -91,6 +91,16 @@ class CommonConfiguration: NSObject, Configurable {
MXKeyProvider.sharedInstance().delegate = EncryptionKeyManager.shared
sdkOptions.enableNewClientInformationFeature = RiotSettings.shared.enableClientInformationFeature
#if DEBUG
if sdkOptions.isCryptoSDKAvailable {
let isEnabled = RiotSettings.shared.enableCryptoSDK
MXLog.debug("[CryptoSDKConfiguration] Crypto SDK is \(isEnabled ? "enabled" : "disabled")")
sdkOptions.enableCryptoSDK = isEnabled
} else {
MXLog.debug("[CryptoSDKConfiguration] Crypto SDK is not available)")
}
#endif
}
private func makeASCIIUserAgent() -> String? {

11
Config/CryptoSDKConfiguration.swift
View file

@ -22,17 +22,6 @@ import Foundation
@objcMembers class CryptoSDKConfiguration: NSObject {
static let shared = CryptoSDKConfiguration()
func setup() {
guard MXSDKOptions.sharedInstance().isCryptoSDKAvailable else {
return
}
let isEnabled = RiotSettings.shared.enableCryptoSDK
MXSDKOptions.sharedInstance().enableCryptoSDK = isEnabled
MXLog.debug("[CryptoSDKConfiguration] setup: Crypto SDK is \(isEnabled ? "enabled" : "disabled")")
}
func enable() {
guard MXSDKOptions.sharedInstance().isCryptoSDKAvailable else {
return