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

update crypto state of the room in realtime when turned on

Browse source
This commit is contained in:
Matthew Hodgson 2016-09-15 19:25:53 +01:00
parent 1899d61893
commit b98c2ae25e
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,7 +467,12 @@ module.exports = React.createClass({
);
var e2e;
if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
// cosmetic padlocks:
if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />;
}
// real padlocks
else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
}