matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Don't try to set crypto options without crypto enabled

Browse Source
This commit is contained in:
David Baker
2020-01-13 21:54:14 +00:00
parent e47240d838
commit 9a1be1a24d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/MatrixChat.js
View File

@@ -1505,7 +1505,6 @@ export default createReactClass({
"blacklistUnverifiedDevices", "blacklistUnverifiedDevices",
); );
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled); cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
}
// With cross-signing enabled, we send to unknown devices // With cross-signing enabled, we send to unknown devices
// without prompting. Any bad-device status the user should // without prompting. Any bad-device status the user should
@@ -1515,6 +1514,8 @@ export default createReactClass({
cli.setGlobalErrorOnUnknownDevices( cli.setGlobalErrorOnUnknownDevices(
!SettingsStore.isFeatureEnabled("feature_cross_signing"), !SettingsStore.isFeatureEnabled("feature_cross_signing"),
); );
}
}, },
showScreen: function(screen, params) { showScreen: function(screen, params) {