Add config option for e2e group call signalling

src/client.ts

@@ -346,6 +346,12 @@ export interface ICreateClientOpts {
  */
  fallbackICEServerAllowed?: boolean;
 
+ /**
+ * If true, to-device signalling for group calls will be encrypted
+ * with Olm. Default: true.
+ */
+ useE2eForGroupCall?: boolean;
+
  cryptoCallbacks?: ICryptoCallbacks;
 }
 
@@ -954,6 +960,8 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
  protected sessionId: string;
  protected pendingEventEncryption = new Map<string, Promise<void>>();
 
+ private useE2eForGroupCall = true;
+
  constructor(opts: IMatrixClientCreateOpts) {
  super();
 
@@ -1044,6 +1052,8 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
  this.supportsCallTransfer = opts.supportsCallTransfer || false;
  this.fallbackICEServerAllowed = opts.fallbackICEServerAllowed || false;
 
+ if (opts.useE2eForGroupCall !== undefined) this.useE2eForGroupCall = opts.useE2eForGroupCall;
+
  // List of which rooms have encryption enabled: separate from crypto because
  // we still want to know which rooms are encrypted even if crypto is disabled:
  // we don't want to start sending unencrypted events to them.
@@ -1499,6 +1509,15 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
  this.supportsCallTransfer = support;
  }
 
+ /**
+ * Returns true if to-device signalling for group calls will be encrypted with Olm.
+ * If false, it will be sent unencrypted.
+ * @returns boolean Whether group call signalling will be encrypted
+ */
+ public getUseE2eForGroupCall(): boolean {
+ return this.useE2eForGroupCall;
+ }
+
  /**
  * Creates a new call.
  * The place*Call methods on the returned call can be used to actually place a call

src/webrtc/call.ts

@@ -525,6 +525,7 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
 
  private async initOpponentCrypto() {
  if (!this.opponentDeviceId) return;
+ if (!this.client.getUseE2eForGroupCall()) return;
 
  const userId = this.invitee || this.getOpponentMember().userId;
  const deviceInfoMap = await this.client.crypto.deviceList.downloadKeys([userId], false);
@@ -2144,21 +2145,30 @@ export class MatrixCall extends TypedEventEmitter<CallEvent, CallEventHandlerMap
  },
  });
 
- const payload = {
- type: eventType,
- content: {
- ...realContent,
- device_id: this.client.deviceId,
- sender_session_id: this.client.getSessionId(),
- dest_session_id: this.opponentSessionId,
- seq: toDeviceSeq,
- },
+ const content = {
+ ...realContent,
+ device_id: this.client.deviceId,
+ sender_session_id: this.client.getSessionId(),
+ dest_session_id: this.opponentSessionId,
+ seq: toDeviceSeq,
  };
+
  const userId = this.invitee || this.getOpponentMember().userId;
- return this.client.crypto.encryptAndSendToDevices([{
- userId,
- deviceInfo: this.opponentDeviceInfo,
- }], payload);
+ if (this.client.getUseE2eForGroupCall()) {
+ return this.client.crypto.encryptAndSendToDevices([{
+ userId,
+ deviceInfo: this.opponentDeviceInfo,
+ }], {
+ type: eventType,
+ content,
+ });
+ } else {
+ return this.client.sendToDevice(eventType, {
+ [userId]: {
+ [this.opponentDeviceId]: content,
+ },
+ });
+ }
  } else {
  this.emit(CallEvent.SendVoipEvent, {
  type: "sendEvent",