Rebase/element ios 1.10.2 #761
Conversation
Inform the user about decryption errors during a voice broadcast
…ad_option_for_rooms Flescio/7253 add mar kas unread option for rooms
Reset Crypto SDK labs on logout
…support Labs: Rich text editor: enable list items indentation
…arked as such (#7352) * fix green dot only to appear for marked action
Fix some crashes
Config/BuildSettings.swift
Outdated
| @@ -406,8 +406,7 @@ final class BuildSettings: NSObject { | |||
|
|
|||
| // MARK: - Polls | |||
|
|
|||
| static let pollsEnabled = false // Currently disabled in Tchap. | |||
| static var pollsHistoryEnabled: Bool = false | |||
| static let pollsEnabled = true | |||
There was a problem hiding this comment.
@NicolasBuquet did you enable the polls on purpose?
There was a problem hiding this comment.
No, I missed it. I fixed it.
| sdkOptions.enableCryptoSDK = isEnabled | ||
| sdkOptions.enableStartupProgress = isEnabled | ||
| } else { | ||
| MXLog.debug("[CommonConfiguration] Crypto SDK is not available)") |
There was a problem hiding this comment.
@NicolasBuquet FYI this configuration is related to the new Rust based Crypto SDK.
enableCryptoSDK should stay false until you decide to switch on this new Crypto SDK. You're using the previous one by default. Let us know if you need more details on this new Crypto SDK
You may have a look on sdkOptions.isCryptoSDKAvailable. This flag is true by default now at the matrix-ios-sdk level (https://github.com/matrix-org/matrix-ios-sdk/blob/develop/MatrixSDK/MXSDKOptions.m#L58). You should be able to keep the control with enableCryptoSDK flag
There was a problem hiding this comment.
Thank you. I updated the PR with your advice.
Config/CommonConfiguration.swift
Outdated
| let isEnabled = RiotSettings.shared.enableCryptoSDK | ||
| // Tchap : force to not use the new Rust based Crypto SDK | ||
| // let isEnabled = RiotSettings.shared.enableCryptoSDK | ||
| let isEnabled = false |
There was a problem hiding this comment.
The value is false by default. Why do you need to force this value ?
There was a problem hiding this comment.
@NicolasBuquet my comment on this code was a remark. You should keep the code from Element here
This is important to track RiotSettings.shared.enableCryptoSDK in your next rebase (to detect when it would be true by default). Currently it is false by default
There was a problem hiding this comment.
I reverted the commit.
I saw the default value was false. But I didn't know if this property was changed to true by any way in another place of the sdk. So, to be sure, I preferred set it to false when using it in Tchap.
|
@NicolasBuquet you have a conflict not resolved. |
NicolasBuquet
force-pushed
the
rebase/element-ios-1.10.2
branch
from
e8cf398 to
84bb705
Compare
#760