Read url params for auto leave

Author: toger5

src/UrlParams.ts

@@ -71,6 +71,14 @@ export interface UrlParams {
    * is window.controls.onBackButtonPressed.
    */
   header: HeaderStyle;
+  /**
+   * If we want the app to automatically leave the call when all other participants
+   * leave the call.
+   *
+   * This is used in settings where EC should behave more like a phone call other than a conference.
+   * Like in a DM.
+   */
+  telephoneAutoLeave: boolean;
   /**
    * Whether the controls should be shown. For screen recording no controls can be desired.
    */
@@ -329,6 +337,7 @@ export const getUrlParams = (
     rageshakeSubmitUrl: parser.getParam("rageshakeSubmitUrl"),
     sentryDsn: parser.getParam("sentryDsn"),
     sentryEnvironment: parser.getParam("sentryEnvironment"),
+    telephoneAutoLeave: parser.getFlagParam("telephoneAutoLeave"),
   };
 };
 

src/room/GroupCallView.tsx

@@ -166,15 +166,18 @@ export const GroupCallView: FC<Props> = ({
   const { displayName, avatarUrl } = useProfile(client);
   const roomName = useRoomName(room);
   const roomAvatar = useRoomAvatar(room);
-  const { perParticipantE2EE, returnToLobby } = useUrlParams();
+  const {
+    perParticipantE2EE,
+    returnToLobby,
+    password: passwordFromUrl,
+  } = useUrlParams();
   const e2eeSystem = useRoomEncryptionSystem(room.roomId);
   const [useNewMembershipManager] = useSetting(useNewMembershipManagerSetting);
   const [useExperimentalToDeviceTransport] = useSetting(
     useExperimentalToDeviceTransportSetting,
   );
 
   // Save the password once we start the groupCallView
-  const { password: passwordFromUrl } = useUrlParams();
   useEffect(() => {
     if (passwordFromUrl) saveKeyForRoom(room.roomId, passwordFromUrl);
   }, [passwordFromUrl, room.roomId]);

src/room/InCallView.tsx

@@ -162,6 +162,8 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
     };
   }, [livekitRoom]);
 
+  const { telephoneAutoLeave } = useUrlParams();
+
   useEffect(() => {
     if (livekitRoom !== undefined) {
       const reactionsReader = new ReactionsReader(props.rtcSession);
@@ -171,7 +173,7 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
         mediaDevices,
         {
           encryptionSystem: props.e2eeSystem,
-          autoLeaveWhenOthersLeft: undefined,
+          autoLeaveWhenOthersLeft: telephoneAutoLeave,
         },
         connStateObservable$,
         reactionsReader.raisedHands$,
@@ -189,6 +191,7 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
     mediaDevices,
     props.e2eeSystem,
     connStateObservable$,
+    telephoneAutoLeave,
   ]);
 
   if (livekitRoom === undefined || vm === null) return null;

src/state/CallViewModel.test.ts

@@ -272,7 +272,7 @@ function withCallViewModel(
     liveKitRoom,
     mediaDevices,
     {
-      kind: E2eeType.PER_PARTICIPANT,
+      encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
     },
     connectionState$,
     raisedHands$,

src/utils/test-viewmodel.ts

@@ -139,7 +139,7 @@ export function getBasicCallViewModelEnvironment(
     liveKitRoom,
     mockMediaDevices({}),
     {
-      kind: E2eeType.PER_PARTICIPANT,
+      encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
     },
     of(ConnectionState.Connected),
     handRaisedSubject$,