Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-02 19:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename setting name

Browse Source
This commit is contained in:
Timo
2025-03-07 14:26:36 +01:00
parent ebcd8904ed
commit 4929ea671c
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/room/GroupCallView.tsx
View File

@@ -162,7 +162,7 @@ export const GroupCallView: FC<Props> = ({
const roomAvatar = useRoomAvatar(room); const roomAvatar = useRoomAvatar(room);
const { perParticipantE2EE, returnToLobby } = useUrlParams(); const { perParticipantE2EE, returnToLobby } = useUrlParams();
const e2eeSystem = useRoomEncryptionSystem(room.roomId); const e2eeSystem = useRoomEncryptionSystem(room.roomId);
const [newMembershipManager] = useSetting(useNewMembershipManagerSetting); const [useNewMembershipManager] = useSetting(useNewMembershipManagerSetting);
usePageTitle(roomName); usePageTitle(roomName);
@@ -181,9 +181,7 @@ export const GroupCallView: FC<Props> = ({
// Count each member only once, regardless of how many devices they use // Count each member only once, regardless of how many devices they use
const participantCount = useMemo( const participantCount = useMemo(
// TODO REVERT THIS!!! () => new Set<string>(memberships.map((m) => m.sender!)).size,
// It is debatable if the device count is better than the user count but this debate and change should be done in a separate PR.
() => new Set<CallMembership>(memberships).size,
[memberships], [memberships],
); );
@@ -270,7 +268,7 @@ export const GroupCallView: FC<Props> = ({
await enterRTCSessionOrError( await enterRTCSessionOrError(
rtcSession, rtcSession,
perParticipantE2EE, perParticipantE2EE,
newMembershipManager, useNewMembershipManager,
); );
widget.api.transport.reply(ev.detail, {}); widget.api.transport.reply(ev.detail, {});
})().catch((e) => { })().catch((e) => {
@@ -287,7 +285,7 @@ export const GroupCallView: FC<Props> = ({
await enterRTCSessionOrError( await enterRTCSessionOrError(
rtcSession, rtcSession,
perParticipantE2EE, perParticipantE2EE,
newMembershipManager, useNewMembershipManager,
); );
})().catch((e) => { })().catch((e) => {
logger.error("Error joining RTC session", e); logger.error("Error joining RTC session", e);
@@ -297,7 +295,7 @@ export const GroupCallView: FC<Props> = ({
void enterRTCSessionOrError( void enterRTCSessionOrError(
rtcSession, rtcSession,
perParticipantE2EE, perParticipantE2EE,
newMembershipManager, useNewMembershipManager,
); );
} }
} }
@@ -309,7 +307,7 @@ export const GroupCallView: FC<Props> = ({
perParticipantE2EE, perParticipantE2EE,
latestDevices, latestDevices,
latestMuteStates, latestMuteStates,
newMembershipManager, useNewMembershipManager,
]); ]);
const [left, setLeft] = useState(false); const [left, setLeft] = useState(false);
@@ -418,7 +416,7 @@ export const GroupCallView: FC<Props> = ({
enterRTCSessionOrError( enterRTCSessionOrError(
rtcSession, rtcSession,
perParticipantE2EE, perParticipantE2EE,
newMembershipManager, useNewMembershipManager,
).catch((e) => { ).catch((e) => {
logger.error("Error re-entering RTC session on reconnect", e); logger.error("Error re-entering RTC session on reconnect", e);
}); });
@@ -442,7 +440,7 @@ export const GroupCallView: FC<Props> = ({
); );
} }
return GroupCallErrorPage; return GroupCallErrorPage;
}, [t, rtcSession, onLeave, perParticipantE2EE, newMembershipManager]); }, [t, rtcSession, onLeave, perParticipantE2EE, useNewMembershipManager]);
if (!isE2EESupportedBrowser() && e2eeSystem.kind !== E2eeType.NONE) { if (!isE2EESupportedBrowser() && e2eeSystem.kind !== E2eeType.NONE) {
// If we have a encryption system but the browser does not support it. // If we have a encryption system but the browser does not support it.
@@ -473,7 +471,7 @@ export const GroupCallView: FC<Props> = ({
void enterRTCSessionOrError( void enterRTCSessionOrError(
rtcSession, rtcSession,
perParticipantE2EE, perParticipantE2EE,
newMembershipManager, useNewMembershipManager,
) )
} }
confineToRoom={confineToRoom} confineToRoom={confineToRoom}