PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use new CryptoEvent.VerificationRequestReceived event (#11141)

Browse source 
https://github.com/matrix-org/matrix-js-sdk/pull/3514 deprecates
`CryptoEvent.VerificationRequest` in favour of
`CryptoEvent.VerificationRequestReceived`. Use the new event.
This commit is contained in:
Richard van der Hoff 2023-06-28 11:11:18 +01:00 committed by GitHub
parent 3ac9066e46
commit 0a3a111327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MatrixChat.tsx
View file

@ -1659,7 +1659,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
Modal.createDialog(KeySignatureUploadFailedDialog, { failures, source, continuation }); Modal.createDialog(KeySignatureUploadFailedDialog, { failures, source, continuation });
}); });
cli.on(CryptoEvent.VerificationRequest, (request) => { cli.on(CryptoEvent.VerificationRequestReceived, (request) => {
if (request.verifier) { if (request.verifier) {
Modal.createDialog( Modal.createDialog(
IncomingSasDialog, IncomingSasDialog,

2
src/components/views/dialogs/devtools/VerificationExplorer.tsx
View file

@ -83,7 +83,7 @@ const VerificationExplorer: Tool = ({ onBack }: IDevtoolsProps) => {
const cli = useContext(MatrixClientContext); const cli = useContext(MatrixClientContext);
const context = useContext(DevtoolsContext); const context = useContext(DevtoolsContext);
const requests = useTypedEventEmitterState(cli, CryptoEvent.VerificationRequest, () => { const requests = useTypedEventEmitterState(cli, CryptoEvent.VerificationRequestReceived, () => {
return ( return (
cli.crypto?.inRoomVerificationRequests["requestsByRoomId"]?.get(context.room.roomId) ?? cli.crypto?.inRoomVerificationRequests["requestsByRoomId"]?.get(context.room.roomId) ??
new Map<string, VerificationRequest>() new Map<string, VerificationRequest>()

4
src/stores/SetupEncryptionStore.ts
View file

@ -64,7 +64,7 @@ export class SetupEncryptionStore extends EventEmitter {
this.phase = Phase.Loading; this.phase = Phase.Loading;
const cli = MatrixClientPeg.safeGet(); const cli = MatrixClientPeg.safeGet();
cli.on(CryptoEvent.VerificationRequest, this.onVerificationRequest); cli.on(CryptoEvent.VerificationRequestReceived, this.onVerificationRequest);
cli.on(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged); cli.on(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
const requestsInProgress = cli.getCrypto()!.getVerificationRequestsToDeviceInProgress(cli.getUserId()!); const requestsInProgress = cli.getCrypto()!.getVerificationRequestsToDeviceInProgress(cli.getUserId()!);
@ -87,7 +87,7 @@ export class SetupEncryptionStore extends EventEmitter {
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
if (!!cli) { if (!!cli) {
cli.removeListener(CryptoEvent.VerificationRequest, this.onVerificationRequest); cli.removeListener(CryptoEvent.VerificationRequestReceived, this.onVerificationRequest);
cli.removeListener(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged); cli.removeListener(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
} }
} }

4
src/stores/right-panel/RightPanelStore.ts
View file

@ -66,13 +66,13 @@ export default class RightPanelStore extends ReadyWatchingStore {
protected async onReady(): Promise<any> { protected async onReady(): Promise<any> {
this.viewedRoomId = SdkContextClass.instance.roomViewStore.getRoomId(); this.viewedRoomId = SdkContextClass.instance.roomViewStore.getRoomId();
this.matrixClient?.on(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate); this.matrixClient?.on(CryptoEvent.VerificationRequestReceived, this.onVerificationRequestUpdate);
this.loadCacheFromSettings(); this.loadCacheFromSettings();
this.emitAndUpdateSettings(); this.emitAndUpdateSettings();
} }
protected async onNotReady(): Promise<any> { protected async onNotReady(): Promise<any> {
this.matrixClient?.off(CryptoEvent.VerificationRequest, this.onVerificationRequestUpdate); this.matrixClient?.off(CryptoEvent.VerificationRequestReceived, this.onVerificationRequestUpdate);
} }
protected onDispatcherAction(payload: ActionPayload): void { protected onDispatcherAction(payload: ActionPayload): void {