From 669bc76dd543cba3658684a953ae2b77e6e11e3f Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Wed, 8 Oct 2025 01:04:58 -0400
Subject: [PATCH] Replace calls to deprecated resolveActiveFocus

---
 src/state/CallViewModel.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index 1a20589c..5e037b05 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -523,10 +523,12 @@ export class CallViewModel extends ViewModel {
                 multiSfu.value$,
               ],
               (preferred, memberships, multiSfu) => {
+                const oldestMembership =
+                  this.matrixRTCSession.getOldestMembership();
                 const remote = memberships.flatMap((m) => {
                   if (m.sender === this.userId && m.deviceId === this.deviceId)
                     return [];
-                  const t = this.matrixRTCSession.resolveActiveFocus(m);
+                  const t = m.getTransport(oldestMembership ?? m);
                   return t && isLivekitTransport(t)
                     ? [{ membership: m, transport: t }]
                     : [];
@@ -617,10 +619,11 @@ export class CallViewModel extends ViewModel {
         // Until the local transport becomes ready we have no idea which
         // transports will actually need a dedicated remote connection
         if (transports?.local.state === "ready") {
+          const oldestMembership = this.matrixRTCSession.getOldestMembership();
           const localServiceUrl = transports.local.value.livekit_service_url;
           const remoteServiceUrls = new Set(
             transports.remote.flatMap(({ membership, transport }) => {
-              const t = this.matrixRTCSession.resolveActiveFocus(membership);
+              const t = membership.getTransport(oldestMembership ?? membership);
               return t &&
                 isLivekitTransport(t) &&
                 t.livekit_service_url !== localServiceUrl