mirror of https://github.com/vector-im/riot-web
Don't error on unverifie/unknownd devices.
When cross-signing is enabled, we no longer want to fail and prompt the user to ack every device in the room. All the info should be conveyed in the shield colour (although isn't fully just yet). Fixes https://github.com/vector-im/riot-web/issues/11750 Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150pull/21833/head
parent
66b55495bb
commit
76fe87c941
|
@ -1506,6 +1506,15 @@ export default createReactClass({
|
||||||
);
|
);
|
||||||
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")
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
showScreen: function(screen, params) {
|
showScreen: function(screen, params) {
|
||||||
|
|
Loading…
Reference in New Issue