matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code 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
parent 55eec80771 0f8dd102bf
commit 2a0660c545
1 changed files with 7 additions and 1 deletions
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) {
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.state = {
phase: PHASE_START,
phase: phase,
sasVerified: false,
opponentProfile: null,
opponentProfileError: null,