From 649d24b623028f29b9ee4b825a2f838e01e663f8 Mon Sep 17 00:00:00 2001 From: trevor-signal <131492920+trevor-signal@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:49:40 -0500 Subject: [PATCH] Enable link & sync in beta --- ts/textsecure/Provisioner.ts | 2 +- ts/util/isLinkAndSyncEnabled.ts | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ts/textsecure/Provisioner.ts b/ts/textsecure/Provisioner.ts index 2ff5e6156..d825b47ee 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) ? ['backup'] : [], + capabilities: isLinkAndSyncEnabled(this.#appVersion) ? ['backup2'] : [], }) .toString(); diff --git a/ts/util/isLinkAndSyncEnabled.ts b/ts/util/isLinkAndSyncEnabled.ts index 7c48c1090..21d684184 100644 --- a/ts/util/isLinkAndSyncEnabled.ts +++ b/ts/util/isLinkAndSyncEnabled.ts @@ -1,9 +1,7 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { isTestOrMockEnvironment } from '../environment'; -import { isStagingServer } from './isStagingServer'; -import { isAdhoc, isNightly } from './version'; +import { isProduction } from './version'; import { everDone as wasRegistrationEverDone } from './registration'; export function isLinkAndSyncEnabled(version: string): boolean { @@ -12,10 +10,5 @@ export function isLinkAndSyncEnabled(version: string): boolean { return false; } - return ( - isStagingServer() || - isTestOrMockEnvironment() || - isNightly(version) || - isAdhoc(version) - ); + return !isProduction(version); }