Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
Don't error on unverified/unknown devices.
This commit is contained in:
commit
fa174512cc
1 changed files with 9 additions and 0 deletions
|
@ -1505,6 +1505,15 @@ export default createReactClass({
|
|||
"blacklistUnverifiedDevices",
|
||||
);
|
||||
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"),
|
||||
);
|
||||
}
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue