imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Iterate PR first round

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-09-13 18:03:05 +02:00
parent 6e674b97c2
commit 71e84ccb75
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/dialogs/IncomingSasDialog.tsx
View file

@ -28,6 +28,7 @@ import BaseDialog from "./BaseDialog";
import DialogButtons from "../elements/DialogButtons";
import { IDialogProps } from "./IDialogProps";
import { IGeneratedSas, ISasEvent } from "matrix-js-sdk/src/crypto/verification/SAS";
import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
const PHASE_START = 0;
const PHASE_SHOW_SAS = 1;
@ -36,7 +37,7 @@ const PHASE_VERIFIED = 3;
const PHASE_CANCELLED = 4;
interface IProps extends IDialogProps {
verifier: any; // TODO types
verifier: VerificationBase; // TODO types
}
interface IState {
@ -59,7 +60,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
super(props);
let phase = PHASE_START;
if (this.props.verifier.cancelled) {
if (this.props.verifier.hasBeenCancelled) {
console.log("Verifier was cancelled in the background.");
phase = PHASE_CANCELLED;
}
@ -79,7 +80,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
public componentWillUnmount(): void {
if (this.state.phase !== PHASE_CANCELLED && this.state.phase !== PHASE_VERIFIED) {
this.props.verifier.cancel('User cancel');
this.props.verifier.cancel(new Error('User cancel'));
}
this.props.verifier.removeListener('show_sas', this.onVerifierShowSas);
}