From 41c75718455774839c4cb29de984c77cf9f3d8a5 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Thu, 23 Jan 2025 15:41:27 -0500 Subject: [PATCH] Update link & sync availability --- ts/textsecure/Provisioner.ts | 2 +- ts/util/isLinkAndSyncEnabled.ts | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ts/textsecure/Provisioner.ts b/ts/textsecure/Provisioner.ts index d825b47ee..2ff5e6156 100644 --- a/ts/textsecure/Provisioner.ts +++ b/ts/textsecure/Provisioner.ts @@ -422,7 +422,7 @@ export class Provisioner { .toAppUrl({ uuid, pubKey: Bytes.toBase64(cipher.getPublicKey()), - capabilities: isLinkAndSyncEnabled(this.#appVersion) ? ['backup2'] : [], + capabilities: isLinkAndSyncEnabled(this.#appVersion) ? ['backup'] : [], }) .toString(); diff --git a/ts/util/isLinkAndSyncEnabled.ts b/ts/util/isLinkAndSyncEnabled.ts index 21d684184..7c48c1090 100644 --- a/ts/util/isLinkAndSyncEnabled.ts +++ b/ts/util/isLinkAndSyncEnabled.ts @@ -1,7 +1,9 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { isProduction } from './version'; +import { isTestOrMockEnvironment } from '../environment'; +import { isStagingServer } from './isStagingServer'; +import { isAdhoc, isNightly } from './version'; import { everDone as wasRegistrationEverDone } from './registration'; export function isLinkAndSyncEnabled(version: string): boolean { @@ -10,5 +12,10 @@ export function isLinkAndSyncEnabled(version: string): boolean { return false; } - return !isProduction(version); + return ( + isStagingServer() || + isTestOrMockEnvironment() || + isNightly(version) || + isAdhoc(version) + ); }