Remove unused useNewMembershipmanager setting

This commit is contained in:
Half-Shot
2025-10-06 09:21:37 +01:00
parent 2dcb823899
commit f3abcb61cf
5 changed files with 2 additions and 34 deletions

View File

@@ -70,10 +70,7 @@ import {
UnknownCallError, UnknownCallError,
} from "../utils/errors.ts"; } from "../utils/errors.ts";
import { GroupCallErrorBoundary } from "./GroupCallErrorBoundary.tsx"; import { GroupCallErrorBoundary } from "./GroupCallErrorBoundary.tsx";
import { import { useSetting } from "../settings/settings";
useNewMembershipManager as useNewMembershipManagerSetting,
useSetting,
} from "../settings/settings";
import { useTypedEventEmitter } from "../useEvents"; import { useTypedEventEmitter } from "../useEvents";
import { muteAllAudio$ } from "../state/MuteAllAudioModel.ts"; import { muteAllAudio$ } from "../state/MuteAllAudioModel.ts";
import { useAppBarTitle } from "../AppBar.tsx"; import { useAppBarTitle } from "../AppBar.tsx";
@@ -186,7 +183,6 @@ export const GroupCallView: FC<Props> = ({
password: passwordFromUrl, password: passwordFromUrl,
} = useUrlParams(); } = useUrlParams();
const e2eeSystem = useRoomEncryptionSystem(room.roomId); const e2eeSystem = useRoomEncryptionSystem(room.roomId);
const [useNewMembershipManager] = useSetting(useNewMembershipManagerSetting);
// Save the password once we start the groupCallView // Save the password once we start the groupCallView
useEffect(() => { useEffect(() => {
@@ -310,7 +306,6 @@ export const GroupCallView: FC<Props> = ({
mediaDevices, mediaDevices,
latestMuteStates, latestMuteStates,
setJoined, setJoined,
useNewMembershipManager,
]); ]);
// TODO refactor this + "joined" to just one callState // TODO refactor this + "joined" to just one callState

View File

@@ -126,7 +126,6 @@ test("It joins the correct Session", async () => {
{ {
manageMediaKeys: false, manageMediaKeys: false,
useLegacyMemberEvents: false, useLegacyMemberEvents: false,
useNewMembershipManager: true,
useExperimentalToDeviceTransport: false, useExperimentalToDeviceTransport: false,
}, },
); );

View File

@@ -101,7 +101,6 @@ export async function enterRTCSession(
rtcSession: MatrixRTCSession, rtcSession: MatrixRTCSession,
transport: LivekitTransport, transport: LivekitTransport,
encryptMedia: boolean, encryptMedia: boolean,
useNewMembershipManager = true,
useExperimentalToDeviceTransport = false, useExperimentalToDeviceTransport = false,
useMultiSfu = true, useMultiSfu = true,
): Promise<void> { ): Promise<void> {
@@ -123,7 +122,6 @@ export async function enterRTCSession(
{ {
notificationType, notificationType,
callIntent, callIntent,
useNewMembershipManager,
manageMediaKeys: encryptMedia, manageMediaKeys: encryptMedia,
...(useDeviceSessionMemberEvents !== undefined && { ...(useDeviceSessionMemberEvents !== undefined && {
useLegacyMemberEvents: !useDeviceSessionMemberEvents, useLegacyMemberEvents: !useDeviceSessionMemberEvents,
@@ -139,7 +137,7 @@ export async function enterRTCSession(
membershipEventExpiryMs: membershipEventExpiryMs:
matrixRtcSessionConfig?.membership_event_expiry_ms, matrixRtcSessionConfig?.membership_event_expiry_ms,
useExperimentalToDeviceTransport, useExperimentalToDeviceTransport,
useStickyEvents: true, unstableSendStickyEvents: true,
}, },
); );
if (widget) { if (widget) {

View File

@@ -14,7 +14,6 @@ import {
duplicateTiles as duplicateTilesSetting, duplicateTiles as duplicateTilesSetting,
debugTileLayout as debugTileLayoutSetting, debugTileLayout as debugTileLayoutSetting,
showConnectionStats as showConnectionStatsSetting, showConnectionStats as showConnectionStatsSetting,
useNewMembershipManager as useNewMembershipManagerSetting,
useExperimentalToDeviceTransport as useExperimentalToDeviceTransportSetting, useExperimentalToDeviceTransport as useExperimentalToDeviceTransportSetting,
multiSfu as multiSfuSetting, multiSfu as multiSfuSetting,
muteAllAudio as muteAllAudioSetting, muteAllAudio as muteAllAudioSetting,
@@ -40,10 +39,6 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
showConnectionStatsSetting, showConnectionStatsSetting,
); );
const [useNewMembershipManager, setNewMembershipManager] = useSetting(
useNewMembershipManagerSetting,
);
const [alwaysShowIphoneEarpiece, setAlwaysShowIphoneEarpiece] = useSetting( const [alwaysShowIphoneEarpiece, setAlwaysShowIphoneEarpiece] = useSetting(
alwaysShowIphoneEarpieceSetting, alwaysShowIphoneEarpieceSetting,
); );
@@ -140,20 +135,6 @@ export const DeveloperSettingsTab: FC<Props> = ({ client, livekitRooms }) => {
)} )}
/> />
</FieldRow> </FieldRow>
<FieldRow>
<InputField
id="useNewMembershipManager"
type="checkbox"
label={t("developer_mode.use_new_membership_manager")}
checked={!!useNewMembershipManager}
onChange={useCallback(
(event: ChangeEvent<HTMLInputElement>): void => {
setNewMembershipManager(event.target.checked);
},
[setNewMembershipManager],
)}
/>
</FieldRow>
<FieldRow> <FieldRow>
<InputField <InputField
id="useToDeviceKeyTransport" id="useToDeviceKeyTransport"

View File

@@ -115,11 +115,6 @@ export const soundEffectVolume = new Setting<number>(
0.5, 0.5,
); );
export const useNewMembershipManager = new Setting<boolean>(
"new-membership-manager",
true,
);
export const useExperimentalToDeviceTransport = new Setting<boolean>( export const useExperimentalToDeviceTransport = new Setting<boolean>(
"experimental-to-device-transport", "experimental-to-device-transport",
true, true,