OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #556 from matrix-org/rav/decrypt_after_keys_arrive 

Update eventtiles when the events are decrypted
pull/21833/head
David Baker 2016-11-15 14:56:21 +00:00 committed by GitHub
parent ec999f6fa1 b209cc551e
commit bb776c217d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/rooms/EventTile.js
View File

@ -146,6 +146,7 @@ module.exports = WithMatrixClient(React.createClass({
this._suppressReadReceiptAnimation = false; this._suppressReadReceiptAnimation = false;
this.props.matrixClient.on("deviceVerificationChanged", this.props.matrixClient.on("deviceVerificationChanged",
this.onDeviceVerificationChanged); this.onDeviceVerificationChanged);
this.props.mxEvent.on("Event.decrypted", this._onDecrypted);
}, },
componentWillReceiveProps: function (nextProps) { componentWillReceiveProps: function (nextProps) {
@ -170,6 +171,15 @@ module.exports = WithMatrixClient(React.createClass({
var client = this.props.matrixClient; var client = this.props.matrixClient;
client.removeListener("deviceVerificationChanged", client.removeListener("deviceVerificationChanged",
this.onDeviceVerificationChanged); this.onDeviceVerificationChanged);
this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
},
/** called when the event is decrypted after we show it.
*/
_onDecrypted: function() {
// we need to re-verify the sending device.
this._verifyEvent(this.props.mxEvent);
this.forceUpdate();
}, },
onDeviceVerificationChanged: function(userId, device) { onDeviceVerificationChanged: function(userId, device) {