PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices

Browse source 
Don't error on unverified/unknown devices.
This commit is contained in:
David Baker 2020-01-14 17:12:14 +00:00 committed by GitHub
commit fa174512cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/MatrixChat.js
View file

@ -1505,6 +1505,15 @@ 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"),
);
} }
}, },