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

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-12-15 17:25:25 +00:00
parent 499c0b889b d2066f41d5
commit f2e018257b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,8 @@ module.exports = withMatrixClient(React.createClass({
*/ */
_onDecrypted: function() { _onDecrypted: function() {
// we need to re-verify the sending device. // we need to re-verify the sending device.
// (we call onWidgetLoad in _verifyEvent to handle the case where decryption
// has caused a change in size of the event tile)
this._verifyEvent(this.props.mxEvent); this._verifyEvent(this.props.mxEvent);
this.forceUpdate(); this.forceUpdate();
}, },
@ -214,6 +216,9 @@ module.exports = withMatrixClient(React.createClass({
const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent); const verified = await this.props.matrixClient.isEventSenderVerified(mxEvent);
this.setState({ this.setState({
verified: verified, verified: verified,
}, () => {
// Decryption may have caused a change in size
this.props.onWidgetLoad();
}); });
}, },