From 2c3aa2c108ce6f39bbb01a11db40bff9806d23f0 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:30:17 -0700 Subject: [PATCH] Use system contact attributes when starting call Co-authored-by: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com> Co-authored-by: Scott Nonnenberg --- ts/services/calling.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ts/services/calling.ts b/ts/services/calling.ts index 59a5fb097..5e7636635 100644 --- a/ts/services/calling.ts +++ b/ts/services/calling.ts @@ -127,6 +127,7 @@ import { } from '../util/callDisposition'; import { isNormalNumber } from '../util/isNormalNumber'; import { LocalCallEvent } from '../types/CallDisposition'; +import { isInSystemContacts } from '../util/isInSystemContacts'; const { processGroupCallRingCancellation, @@ -2291,15 +2292,15 @@ export class CallingClass { return false; } - // If the peer is 'unknown', i.e. not in the contact list, force IP hiding. - const isContactUnknown = !conversation.isFromOrAddedByTrustedContact(); + // If the peer is not in the user's system contacts, force IP hiding. + const isContactUntrusted = !isInSystemContacts(conversation.attributes); const callSettings = { iceServer: { ...iceServer, urls: iceServer.urls.slice(), }, - hideIp: shouldRelayCalls || isContactUnknown, + hideIp: shouldRelayCalls || isContactUntrusted, dataMode: DataMode.Normal, // TODO: DESKTOP-3101 // audioLevelsIntervalMillis: AUDIO_LEVEL_INTERVAL_MS,