diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index 49d8b60b..a9c31150 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -70,10 +70,7 @@ import { UnknownCallError, } from "../utils/errors.ts"; import { GroupCallErrorBoundary } from "./GroupCallErrorBoundary.tsx"; -import { - useNewMembershipManager as useNewMembershipManagerSetting, - useSetting, -} from "../settings/settings"; +import { useSetting } from "../settings/settings"; import { useTypedEventEmitter } from "../useEvents"; import { muteAllAudio$ } from "../state/MuteAllAudioModel.ts"; import { useAppBarTitle } from "../AppBar.tsx"; @@ -186,7 +183,6 @@ export const GroupCallView: FC = ({ password: passwordFromUrl, } = useUrlParams(); const e2eeSystem = useRoomEncryptionSystem(room.roomId); - const [useNewMembershipManager] = useSetting(useNewMembershipManagerSetting); // Save the password once we start the groupCallView useEffect(() => { @@ -310,7 +306,6 @@ export const GroupCallView: FC = ({ mediaDevices, latestMuteStates, setJoined, - useNewMembershipManager, ]); // TODO refactor this + "joined" to just one callState diff --git a/src/rtcSessionHelpers.test.ts b/src/rtcSessionHelpers.test.ts index 258d2f9a..b2caaf89 100644 --- a/src/rtcSessionHelpers.test.ts +++ b/src/rtcSessionHelpers.test.ts @@ -126,7 +126,6 @@ test("It joins the correct Session", async () => { { manageMediaKeys: false, useLegacyMemberEvents: false, - useNewMembershipManager: true, useExperimentalToDeviceTransport: false, }, ); diff --git a/src/rtcSessionHelpers.ts b/src/rtcSessionHelpers.ts index f8bdb03b..3dd7c5f8 100644 --- a/src/rtcSessionHelpers.ts +++ b/src/rtcSessionHelpers.ts @@ -101,7 +101,6 @@ export async function enterRTCSession( rtcSession: MatrixRTCSession, transport: LivekitTransport, encryptMedia: boolean, - useNewMembershipManager = true, useExperimentalToDeviceTransport = false, useMultiSfu = true, ): Promise { @@ -123,7 +122,6 @@ export async function enterRTCSession( { notificationType, callIntent, - useNewMembershipManager, manageMediaKeys: encryptMedia, ...(useDeviceSessionMemberEvents !== undefined && { useLegacyMemberEvents: !useDeviceSessionMemberEvents, @@ -139,7 +137,7 @@ export async function enterRTCSession( membershipEventExpiryMs: matrixRtcSessionConfig?.membership_event_expiry_ms, useExperimentalToDeviceTransport, - useStickyEvents: true, + unstableSendStickyEvents: true, }, ); if (widget) { diff --git a/src/settings/DeveloperSettingsTab.tsx b/src/settings/DeveloperSettingsTab.tsx index 36c8a2e6..c24eadc5 100644 --- a/src/settings/DeveloperSettingsTab.tsx +++ b/src/settings/DeveloperSettingsTab.tsx @@ -14,7 +14,6 @@ import { duplicateTiles as duplicateTilesSetting, debugTileLayout as debugTileLayoutSetting, showConnectionStats as showConnectionStatsSetting, - useNewMembershipManager as useNewMembershipManagerSetting, useExperimentalToDeviceTransport as useExperimentalToDeviceTransportSetting, multiSfu as multiSfuSetting, muteAllAudio as muteAllAudioSetting, @@ -40,10 +39,6 @@ export const DeveloperSettingsTab: FC = ({ client, livekitRooms }) => { showConnectionStatsSetting, ); - const [useNewMembershipManager, setNewMembershipManager] = useSetting( - useNewMembershipManagerSetting, - ); - const [alwaysShowIphoneEarpiece, setAlwaysShowIphoneEarpiece] = useSetting( alwaysShowIphoneEarpieceSetting, ); @@ -140,20 +135,6 @@ export const DeveloperSettingsTab: FC = ({ client, livekitRooms }) => { )} /> - - ): void => { - setNewMembershipManager(event.target.checked); - }, - [setNewMembershipManager], - )} - /> - ( 0.5, ); -export const useNewMembershipManager = new Setting( - "new-membership-manager", - true, -); - export const useExperimentalToDeviceTransport = new Setting( "experimental-to-device-transport", true,