1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00

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

Remove feature_cross_signing
This commit is contained in:
Michael Telatynski
2020-06-03 10:42:13 +01:00
committed by GitHub
25 changed files with 136 additions and 1696 deletions

View File

@@ -879,15 +879,6 @@ export default createReactClass({
});
return;
}
if (!SettingsStore.getValue("feature_cross_signing")) {
room.hasUnverifiedDevices().then((hasUnverifiedDevices) => {
this.setState({
e2eStatus: hasUnverifiedDevices ? "warning" : "verified",
});
});
debuglog("e2e check is warning/verified only as cross-signing is off");
return;
}
/* At this point, the user has encryption on and cross-signing on */
this.setState({