From 4929ea671c256d5a9430dacca321ab43d1f7205a Mon Sep 17 00:00:00 2001
From: Timo <toger5@hotmail.de>
Date: Fri, 7 Mar 2025 14:26:36 +0100
Subject: [PATCH] rename setting name

---
 src/room/GroupCallView.tsx | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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