Skip to content

Commit

Permalink
Don't error on unverifie/unknownd devices.
Browse files Browse the repository at this point in the history
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 element-hq/element-web#11750
Requires matrix-org/matrix-js-sdk#1150
  • Loading branch information
dbkr committed Jan 13, 2020
1 parent 66b5549 commit 76fe87c
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/components/structures/MatrixChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,15 @@ export default createReactClass({
);
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) {
Expand Down

0 comments on commit 76fe87c

Please sign in to comment.