This commit is contained in:
Timo K.
2026-07-07 19:45:22 +02:00
parent 706cddafb0
commit 2b84c587f2
2 changed files with 5 additions and 3 deletions

View File

@@ -40,7 +40,7 @@ import {
timer, timer,
takeUntil, takeUntil,
} from "rxjs"; } from "rxjs";
import { logger as rootLogger } from "matrix-js-sdk/lib/logger"; import { type Logger, logger as rootLogger } from "matrix-js-sdk/lib/logger";
import { import {
MembershipManagerEvent, MembershipManagerEvent,
type LivekitTransportConfig, type LivekitTransportConfig,
@@ -157,7 +157,6 @@ import {
} from "../media/RingingMediaViewModel.ts"; } from "../media/RingingMediaViewModel.ts";
import { type GridTileViewModel } from "../TileViewModel.ts"; import { type GridTileViewModel } from "../TileViewModel.ts";
//TODO //TODO
// Larger rename // Larger rename
// member,membership -> rtcMember // member,membership -> rtcMember
@@ -421,6 +420,7 @@ export function createCallViewModel$(
const livekitKeyProvider = getE2eeKeyProvider( const livekitKeyProvider = getE2eeKeyProvider(
options.encryptionSystem, options.encryptionSystem,
matrixRTCSession, matrixRTCSession,
logger,
); );
// matrix_rtc_mode in config.json overrides the user's Developer Settings choice. // matrix_rtc_mode in config.json overrides the user's Developer Settings choice.
// It is validated at config load (src/config/Config.ts) so the cast is safe. // It is validated at config load (src/config/Config.ts) so the cast is safe.
@@ -1798,6 +1798,7 @@ export function createCallViewModel$(
function getE2eeKeyProvider( function getE2eeKeyProvider(
e2eeSystem: EncryptionSystem, e2eeSystem: EncryptionSystem,
rtcSession: MatrixRTCSession, rtcSession: MatrixRTCSession,
logger: Logger,
): BaseKeyProvider | undefined { ): BaseKeyProvider | undefined {
if (e2eeSystem.kind === E2eeType.NONE) return undefined; if (e2eeSystem.kind === E2eeType.NONE) return undefined;

View File

@@ -193,6 +193,7 @@ export const createLocalTransport$ = ({
roomId, roomId,
client, client,
delayId ?? undefined, delayId ?? undefined,
logger,
); );
} catch (e) { } catch (e) {
logger.error( logger.error(
@@ -312,7 +313,7 @@ async function doOpenIdAndJWTFromUrl(
> & > &
OpenIDClientParts, OpenIDClientParts,
delayId?: string, delayId?: string,
logger: Logger, logger?: Logger,
): Promise<LocalTransportWithSFUConfig> { ): Promise<LocalTransportWithSFUConfig> {
const sfuConfig = await getSFUConfigWithOpenID( const sfuConfig = await getSFUConfigWithOpenID(
client, client,