matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branch 'develop' into travis/split-left-panel

Browse Source
This commit is contained in:
Travis Ralston
2020-06-04 15:09:51 -06:00
parent 6d96d66c03 02cdc8a201
commit dc01607ad9
83 changed files with 1185 additions and 3146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/RoomView.js
View File

@@ -880,15 +880,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({