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

Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-09-22 10:42:02 +02:00
commit d3e340e7ce
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
194 changed files with 3881 additions and 17100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,8 @@ 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";
import { logger } from "matrix-js-sdk/src/logger";
const PHASE_START = 0;
const PHASE_SHOW_SAS = 1;
const PHASE_WAIT_FOR_PARTNER_TO_CONFIRM = 2;
@ -61,7 +63,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
let phase = PHASE_START;
if (this.props.verifier.hasBeenCancelled) {
console.log("Verifier was cancelled in the background.");
logger.log("Verifier was cancelled in the background.");
phase = PHASE_CANCELLED;
}
@ -113,7 +115,7 @@ export default class IncomingSasDialog extends React.Component<IProps, IState> {
this.props.verifier.verify().then(() => {
this.setState({ phase: PHASE_VERIFIED });
}).catch((e) => {
console.log("Verification failed", e);
logger.log("Verification failed", e);
});
};