mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
Merge pull request #7330 from vector-im/andy/crypto_config
Fix crypto v2 config
This commit is contained in:
commit
2ead5ed971
3 changed files with 10 additions and 14 deletions
|
@ -24,9 +24,6 @@ class AppConfiguration: CommonConfiguration {
|
|||
override func setupSettings() {
|
||||
super.setupSettings()
|
||||
setupAppSettings()
|
||||
#if DEBUG
|
||||
CryptoSDKConfiguration.shared.setup()
|
||||
#endif
|
||||
}
|
||||
|
||||
private func setupAppSettings() {
|
||||
|
|
|
@ -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? {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue