OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace `MatrixClient.prepareToEncrypt` by `MatrixClient.getCrypto.prepareToEncrypt` (#146)

pull/28192/head
Florian Duros 2024-10-15 09:50:38 +02:00 committed by GitHub
parent 503d9004d1
commit bce02634f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LegacyCallHandler.tsx
View File

@ -367,7 +367,7 @@ export default class LegacyCallHandler extends EventEmitter {
// the mapped one: that's where we'll send the events. // the mapped one: that's where we'll send the events.
const cli = MatrixClientPeg.safeGet(); const cli = MatrixClientPeg.safeGet();
const room = cli.getRoom(call.roomId); const room = cli.getRoom(call.roomId);
if (room) cli.prepareToEncrypt(room); if (room) cli.getCrypto()?.prepareToEncrypt(room);
}; };
public getCallById(callId: string): MatrixCall | null { public getCallById(callId: string): MatrixCall | null {

2
src/components/views/rooms/SendMessageComposer.tsx
View File

@ -268,7 +268,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
if (this.props.mxClient.isCryptoEnabled() && this.props.mxClient.isRoomEncrypted(this.props.room.roomId)) { if (this.props.mxClient.isCryptoEnabled() && this.props.mxClient.isRoomEncrypted(this.props.room.roomId)) {
this.prepareToEncrypt = throttle( this.prepareToEncrypt = throttle(
() => { () => {
this.props.mxClient.prepareToEncrypt(this.props.room); this.props.mxClient.getCrypto()?.prepareToEncrypt(this.props.room);
}, },
60000, 60000,
{ leading: true, trailing: false }, { leading: true, trailing: false },

1
test/LegacyCallHandler-test.ts
View File

@ -588,7 +588,6 @@ describe("LegacyCallHandler without third party protocols", () => {
jest.spyOn(MatrixClientPeg.safeGet(), "supportsVoip").mockReturnValue(true); jest.spyOn(MatrixClientPeg.safeGet(), "supportsVoip").mockReturnValue(true);
MatrixClientPeg.safeGet().isFallbackICEServerAllowed = jest.fn(); MatrixClientPeg.safeGet().isFallbackICEServerAllowed = jest.fn();
MatrixClientPeg.safeGet().prepareToEncrypt = jest.fn();
MatrixClientPeg.safeGet().pushRules = { MatrixClientPeg.safeGet().pushRules = {
global: { global: {

7
test/components/views/rooms/SendMessageComposer-test.tsx
View File

@ -573,10 +573,9 @@ describe("<SendMessageComposer/>", () => {
const cli = stubClient(); const cli = stubClient();
cli.isCryptoEnabled = jest.fn().mockReturnValue(true); cli.isCryptoEnabled = jest.fn().mockReturnValue(true);
cli.isRoomEncrypted = jest.fn().mockReturnValue(true); cli.isRoomEncrypted = jest.fn().mockReturnValue(true);
cli.prepareToEncrypt = jest.fn();
const room = mkStubRoom("!roomId:server", "Room", cli); const room = mkStubRoom("!roomId:server", "Room", cli);
expect(cli.prepareToEncrypt).not.toHaveBeenCalled(); expect(cli.getCrypto()!.prepareToEncrypt).not.toHaveBeenCalled();
const { container } = render( const { container } = render(
<MatrixClientContext.Provider value={cli}> <MatrixClientContext.Provider value={cli}>
@ -588,9 +587,9 @@ describe("<SendMessageComposer/>", () => {
// Does not trigger on keydown as that'll cause false negatives for global shortcuts // Does not trigger on keydown as that'll cause false negatives for global shortcuts
await userEvent.type(composer, "[ControlLeft>][KeyK][/ControlLeft]"); await userEvent.type(composer, "[ControlLeft>][KeyK][/ControlLeft]");
expect(cli.prepareToEncrypt).not.toHaveBeenCalled(); expect(cli.getCrypto()!.prepareToEncrypt).not.toHaveBeenCalled();
await userEvent.type(composer, "Hello"); await userEvent.type(composer, "Hello");
expect(cli.prepareToEncrypt).toHaveBeenCalled(); expect(cli.getCrypto()!.prepareToEncrypt).toHaveBeenCalled();
}); });
}); });

1
test/test-utils/test-utils.ts
View File

@ -133,6 +133,7 @@ export function createTestClient(): MatrixClient {
isEncryptionEnabledInRoom: jest.fn(), isEncryptionEnabledInRoom: jest.fn(),
getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]), getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
setDeviceIsolationMode: jest.fn(), setDeviceIsolationMode: jest.fn(),
prepareToEncrypt: jest.fn(),
}), }),
getPushActionsForEvent: jest.fn(), getPushActionsForEvent: jest.fn(),