feature-gate calls everywhere in the app

src/domain/session/SessionViewModel.js

@@ -130,9 +130,11 @@ export class SessionViewModel extends ViewModel {
 
     start() {
         this._sessionStatusViewModel.start();
-        this._client.session.callHandler.loadCalls("m.ring");
+        if (this.features.calls) {
-        // TODO: only do this when opening the room
+            this._client.session.callHandler.loadCalls("m.ring");
-        this._client.session.callHandler.loadCalls("m.prompt");
+            // TODO: only do this when opening the room
+            this._client.session.callHandler.loadCalls("m.prompt");
+        }
     }
 
     get activeMiddleViewModel() {

src/domain/session/room/RoomViewModel.js

@@ -50,6 +50,9 @@ export class RoomViewModel extends ErrorReportViewModel {
     }
 
     _setupCallViewModel() {
+        if (!this.features.calls) {
+            return;
+        }
         // pick call for this room with lowest key
         const calls = this.getOption("session").callHandler.calls;
         this._callObservable = new PickMapObservableValue(calls.filterValues(c => {
@@ -421,6 +424,10 @@ export class RoomViewModel extends ErrorReportViewModel {
 
     startCall() {
         return this.logAndCatch("RoomViewModel.startCall", async log => {
+            if (!this.features.calls) {
+                log.set("feature_disbled", true);
+                return;
+            }
             log.set("roomId", this._room.id);
             let localMedia;
             try {

src/domain/session/room/timeline/tiles/index.ts

@@ -92,7 +92,7 @@ export function tileClassForEntry(entry: TimelineEntry, options: Options): TileC
             case "org.matrix.msc3401.call": {
                 // if prevContent is present, it's an update to a call event, which we don't render
                 // as the original event is updated through the call object which receive state event updates
-                if (entry.stateKey && !entry.prevContent) {
+                if (options.features.calls && entry.stateKey && !entry.prevContent) {
                     return CallTile;
                 }
                 return undefined;

src/domain/session/toast/ToastCollectionViewModel.ts

@@ -33,8 +33,10 @@ export class ToastCollectionViewModel extends ViewModel<SegmentType, Options> {
     constructor(options: Options) {
         super(options);
         const session = this.getOption("session");
-        const callsObservableMap = session.callHandler.calls;
+        if (this.features.calls) {
-        this.track(callsObservableMap.subscribe(this));
+            const callsObservableMap = session.callHandler.calls;
+            this.track(callsObservableMap.subscribe(this));
+        }
     }
 
     async onAdd(_, call: GroupCall) {

src/matrix/Session.js

@@ -75,6 +75,61 @@ export class Session {
         };
         this._roomsBeingCreated = new ObservableMap();
         this._user = new User(sessionInfo.userId);
+        this._roomStateHandler = new RoomStateHandlerSet();
+        this._deviceMessageHandler = new DeviceMessageHandler({storage, callHandler: this._callHandler});
+        this._olm = olm;
+        this._olmUtil = null;
+        this._e2eeAccount = null;
+        this._deviceTracker = null;
+        this._olmEncryption = null;
+        this._keyLoader = null;
+        this._megolmEncryption = null;
+        this._megolmDecryption = null;
+        this._getSyncToken = () => this.syncToken;
+        this._olmWorker = olmWorker;
+        this._keyBackup = new ObservableValue(undefined);
+        this._observedRoomStatus = new Map();
+
+        if (olm) {
+            this._olmUtil = new olm.Utility();
+            this._deviceTracker = new DeviceTracker({
+                storage,
+                getSyncToken: this._getSyncToken,
+                olmUtil: this._olmUtil,
+                ownUserId: sessionInfo.userId,
+                ownDeviceId: sessionInfo.deviceId,
+            });
+        }
+        this._createRoomEncryption = this._createRoomEncryption.bind(this);
+        this._forgetArchivedRoom = this._forgetArchivedRoom.bind(this);
+        this.needsKeyBackup = new ObservableValue(false);
+
+        if (features.calls) {
+            this._setupCallHandler();
+        }
+    }
+
+    get fingerprintKey() {
+        return this._e2eeAccount?.identityKeys.ed25519;
+    }
+
+    get hasSecretStorageKey() {
+        return this._hasSecretStorageKey;
+    }
+
+    get deviceId() {
+        return this._sessionInfo.deviceId;
+    }
+
+    get userId() {
+        return this._sessionInfo.userId;
+    }
+
+    get callHandler() {
+        return this._callHandler;
+    }
+
+    _setupCallHandler() {
         this._callHandler = new CallHandler({
             clock: this._platform.clock,
             random: this._platform.random,
@@ -103,55 +158,7 @@ export class Session {
             logger: this._platform.logger,
             forceTURN: false,
         });
-        this._roomStateHandler = new RoomStateHandlerSet();
         this.observeRoomState(this._callHandler);
-        this._deviceMessageHandler = new DeviceMessageHandler({storage, callHandler: this._callHandler});
-        this._olm = olm;
-        this._olmUtil = null;
-        this._e2eeAccount = null;
-        this._deviceTracker = null;
-        this._olmEncryption = null;
-        this._keyLoader = null;
-        this._megolmEncryption = null;
-        this._megolmDecryption = null;
-        this._getSyncToken = () => this.syncToken;
-        this._olmWorker = olmWorker;
-        this._keyBackup = new ObservableValue(undefined);
-        this._observedRoomStatus = new Map();
-
-        if (olm) {
-            this._olmUtil = new olm.Utility();
-            this._deviceTracker = new DeviceTracker({
-                storage,
-                getSyncToken: this._getSyncToken,
-                olmUtil: this._olmUtil,
-                ownUserId: sessionInfo.userId,
-                ownDeviceId: sessionInfo.deviceId,
-            });
-        }
-        this._createRoomEncryption = this._createRoomEncryption.bind(this);
-        this._forgetArchivedRoom = this._forgetArchivedRoom.bind(this);
-        this.needsKeyBackup = new ObservableValue(false);
-    }
-
-    get fingerprintKey() {
-        return this._e2eeAccount?.identityKeys.ed25519;
-    }
-
-    get hasSecretStorageKey() {
-        return this._hasSecretStorageKey;
-    }
-
-    get deviceId() {
-        return this._sessionInfo.deviceId;
-    }
-
-    get userId() {
-        return this._sessionInfo.userId;
-    }
-
-    get callHandler() {
-        return this._callHandler;
     }
 
     // called once this._e2eeAccount is assigned

src/platform/web/ui/session/room/RoomView.js

@@ -73,8 +73,10 @@ export class RoomView extends TemplateView {
         } else {
             const vm = this.value;
             const options = [];
-            options.push(Menu.option(vm.i18n`Room details`, () => vm.openDetailsPanel()))
+            options.push(Menu.option(vm.i18n`Room details`, () => vm.openDetailsPanel()));
-            options.push(Menu.option(vm.i18n`Start call`, () => vm.startCall()))
+            if (vm.features.calls) {
+                options.push(Menu.option(vm.i18n`Start call`, () => vm.startCall()));
+            }
             if (vm.canLeave) {
                 options.push(Menu.option(vm.i18n`Leave room`, () => this._confirmToLeaveRoom()).setDestructive());
             }