Don't try to set crypto options without crypto enabled
This commit is contained in:
parent
e47240d838
commit
9a1be1a24d
1 changed files with 9 additions and 8 deletions
|
@ -1505,16 +1505,17 @@ export default createReactClass({
|
||||||
"blacklistUnverifiedDevices",
|
"blacklistUnverifiedDevices",
|
||||||
);
|
);
|
||||||
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
|
cli.setGlobalBlacklistUnverifiedDevices(blacklistEnabled);
|
||||||
|
|
||||||
|
// With cross-signing enabled, we send to unknown devices
|
||||||
|
// without prompting. Any bad-device status the user should
|
||||||
|
// be aware of will be signalled through the room shield
|
||||||
|
// changing colour. More advanced behaviour will come once
|
||||||
|
// we implement more settings.
|
||||||
|
cli.setGlobalErrorOnUnknownDevices(
|
||||||
|
!SettingsStore.isFeatureEnabled("feature_cross_signing"),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// With cross-signing enabled, we send to unknown devices
|
|
||||||
// without prompting. Any bad-device status the user should
|
|
||||||
// be aware of will be signalled through the room shield
|
|
||||||
// changing colour. More advanced behaviour will come once
|
|
||||||
// we implement more settings.
|
|
||||||
cli.setGlobalErrorOnUnknownDevices(
|
|
||||||
!SettingsStore.isFeatureEnabled("feature_cross_signing"),
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
|
|
||||||
showScreen: function(screen, params) {
|
showScreen: function(screen, params) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue