From 53372efca17967d215d005b93432216ca0b85dd1 Mon Sep 17 00:00:00 2001 From: Miriam Zimmerman Date: Wed, 15 Jan 2025 14:25:14 -0500 Subject: [PATCH] Update remote configs for ringrtcAdm feature. --- ts/RemoteConfig.ts | 4 +++- ts/util/ringrtc/ringrtcAdm.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index d530a1fab..2aa97d648 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -15,7 +15,9 @@ import { HashType } from './types/Crypto'; import { getCountryCode } from './types/PhoneNumber'; export type ConfigKeyType = - | 'desktop.calling.ringrtcAdm' + | 'desktop.calling.ringrtcAdmFull' + | 'desktop.calling.ringrtcAdmInternal' + | 'desktop.calling.ringrtcAdmPreStable' | 'desktop.clientExpiration' | 'desktop.backup.credentialFetch' | 'desktop.internalUser' diff --git a/ts/util/ringrtc/ringrtcAdm.ts b/ts/util/ringrtc/ringrtcAdm.ts index 9583a027d..20a574563 100644 --- a/ts/util/ringrtc/ringrtcAdm.ts +++ b/ts/util/ringrtc/ringrtcAdm.ts @@ -10,14 +10,14 @@ export function getUseRingrtcAdm(): boolean { return localUseRingrtcAdm; } - if ( - isProduction(window.getVersion()) || - !RemoteConfig.isEnabled('desktop.internalUser') - ) { - return false; + if (!RemoteConfig.isEnabled('desktop.internalUser')) { + if (isProduction(window.getVersion())) { + return RemoteConfig.isEnabled('desktop.calling.ringrtcAdmFull'); + } + return RemoteConfig.isEnabled('desktop.calling.ringrtcAdmPreStable'); } - return RemoteConfig.isEnabled('desktop.calling.ringrtcAdm'); + return RemoteConfig.isEnabled('desktop.calling.ringrtcAdmInternal'); } export async function setUseRingrtcAdm(value: boolean): Promise {