imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing

Browse source 
Remove feature_cross_signing
This commit is contained in:
Michael Telatynski 2020-06-03 10:42:13 +01:00 • committed by GitHub
commit 653b2ff060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 136 additions and 1696 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/EventTile.js
View file

@ -325,15 +325,6 @@ export default createReactClass({
return;
}
// If cross-signing is off, the old behaviour is to scream at the user
// as if they've done something wrong, which they haven't
if (!SettingsStore.getValue("feature_cross_signing")) {
this.setState({
verified: E2E_STATE.WARNING,
}, this.props.onHeightChanged);
return;
}
if (!this.context.checkUserTrust(mxEvent.getSender()).isCrossSigningVerified()) {
this.setState({
verified: E2E_STATE.NORMAL,