mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3123 from matrix-org/travis/sas-timeouts

Browse source 
Consider cancelled verifications when mounting IncomingSasDialog
This commit is contained in:
Travis Ralston 2019-06-20 14:29:20 -06:00 committed by GitHub
commit 2a0660c545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/dialogs/IncomingSasDialog.js
View file

@ -34,9 +34,15 @@ export default class IncomingSasDialog extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
let phase = PHASE_START;
if (this.props.verifier.cancelled) {
console.log("Verifier was cancelled in the background.");
phase = PHASE_CANCELLED;
}
this._showSasEvent = null; this._showSasEvent = null;
this.state = { this.state = {
phase: PHASE_START, phase: phase,
sasVerified: false, sasVerified: false,
opponentProfile: null, opponentProfile: null,
opponentProfileError: null, opponentProfileError: null,