Replace MatrixClient.prepareToEncrypt by MatrixClient.getCrypto.prepareToEncrypt

src/LegacyCallHandler.tsx

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

src/components/views/rooms/SendMessageComposer.tsx

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

test/LegacyCallHandler-test.ts

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

test/components/views/rooms/SendMessageComposer-test.tsx

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

test/test-utils/test-utils.ts

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