Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

update immediately, don't wait until verification is done

Browse Source 
this can deadlock, as you can't finish the verification without the UI
This commit is contained in:
Bruno Windels 2020-01-29 15:23:13 +01:00
parent c4f1659116
commit 59dc3cfb97
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/right_panel/VerificationPanel.js
View File

@ -217,9 +217,12 @@ export default class VerificationPanel extends React.PureComponent {
}; };
_onRequestChange = async () => { _onRequestChange = async () => {
this.forceUpdate();
const {request} = this.props; const {request} = this.props;
if (!this._hasVerifier && !!request.verifier) { const hadVerifier = this._hasVerifier;
request.verifier.on('show_sas', this._onVerifierShowSas); this._hasVerifier = !!request.verifier;
if (!hadVerifier && this._hasVerifier) {
request.verifier.once('show_sas', this._onVerifierShowSas);
try { try {
// on the requester side, this is also awaited in _startSAS, // on the requester side, this is also awaited in _startSAS,
// but that's ok as verify should return the same promise. // but that's ok as verify should return the same promise.
@ -227,10 +230,7 @@ export default class VerificationPanel extends React.PureComponent {
} catch (err) { } catch (err) {
console.error("error verify", err); console.error("error verify", err);
} }
} else if (this._hasVerifier && !request.verifier) {
request.verifier.removeListener('show_sas', this._onVerifierShowSas);
} }
this._hasVerifier = !!request.verifier;
}; };
componentDidMount() { componentDidMount() {