From 71d68911323c485d092d9832aeddac10612a30b4 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 20 Jun 2024 12:23:01 -0700
Subject: [PATCH] Disable local delete sync

---
 ts/background.ts                  | 4 +---
 ts/models/conversations.ts        | 8 ++------
 ts/state/ducks/conversations.ts   | 4 ++--
 ts/state/selectors/items-extra.ts | 8 ++------
 ts/textsecure/WebAPI.ts           | 8 ++------
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/ts/background.ts b/ts/background.ts
index c085a5d54a..42c24e50d9 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -1837,9 +1837,7 @@ export async function startApp(): Promise<void> {
         try {
           // Note: we always have to register our capabilities all at once, so we do this
           //   after connect on every startup
-          await server.registerCapabilities({
-            deleteSync: true,
-          });
+          await server.registerCapabilities({});
         } catch (error) {
           log.error(
             'Error: Unable to register our capabilities.',
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 251ac03be8..333714ad55 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -170,7 +170,6 @@ import {
   getConversationToDelete,
   getMessageToDelete,
 } from '../util/deleteForMe';
-import { isEnabled } from '../RemoteConfig';
 import { getCallHistorySelector } from '../state/selectors/callHistory';
 
 /* eslint-disable more/no-then */
@@ -5014,14 +5013,11 @@ export class ConversationModel extends window.Backbone
     });
     window.Signal.Data.updateConversation(this.attributes);
 
+    const enabled = false;
     const ourConversation =
       window.ConversationController.getOurConversationOrThrow();
     const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
-    if (
-      source === 'local-delete' &&
-      capable &&
-      isEnabled('desktop.deleteSync.send')
-    ) {
+    if (source === 'local-delete' && capable && enabled) {
       log.info(`${logId}: Preparing sync message`);
       const timestamp = Date.now();
 
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 7d46407ee1..e951e00da8 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -194,7 +194,6 @@ import {
   getMessageToDelete,
 } from '../../util/deleteForMe';
 import { MAX_MESSAGE_COUNT } from '../../util/deleteForMe.types';
-import { isEnabled } from '../../RemoteConfig';
 import type { CapabilitiesType } from '../../textsecure/WebAPI';
 
 // State
@@ -1768,8 +1767,9 @@ function deleteMessages({
     const ourConversation =
       window.ConversationController.getOurConversationOrThrow();
     const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
+    const enabled = false;
 
-    if (!capable || !isEnabled('desktop.deleteSync.send')) {
+    if (!capable || !enabled) {
       return;
     }
     if (messages.length === 0) {
diff --git a/ts/state/selectors/items-extra.ts b/ts/state/selectors/items-extra.ts
index ea5245210e..1415ac1203 100644
--- a/ts/state/selectors/items-extra.ts
+++ b/ts/state/selectors/items-extra.ts
@@ -5,20 +5,16 @@ import { createSelector } from 'reselect';
 
 import { getUserACI } from './user';
 import { getConversationSelector } from './conversations';
-import { getRemoteConfig, isRemoteConfigFlagEnabled } from './items';
 
 import type { AciString } from '../../types/ServiceId';
-import type { ConfigMapType } from '../../RemoteConfig';
 import type { GetConversationByIdType } from './conversations';
 
 export const getDeleteSyncSendEnabled = createSelector(
   getUserACI,
   getConversationSelector,
-  getRemoteConfig,
   (
     aci: AciString | undefined,
-    conversationSelector: GetConversationByIdType,
-    remoteConfig: ConfigMapType
+    conversationSelector: GetConversationByIdType
   ): boolean => {
     if (!aci) {
       return false;
@@ -33,6 +29,6 @@ export const getDeleteSyncSendEnabled = createSelector(
       return false;
     }
 
-    return isRemoteConfigFlagEnabled(remoteConfig, 'desktop.deleteSync.send');
+    return false;
   }
 );
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 28fc650f6e..5f19a6eb78 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -703,12 +703,8 @@ export type WebAPIConnectType = {
   connect: (options: WebAPIConnectOptionsType) => WebAPIType;
 };
 
-export type CapabilitiesType = {
-  deleteSync: boolean;
-};
-export type CapabilitiesUploadType = {
-  deleteSync: true;
-};
+export type CapabilitiesType = Record<string, never>;
+export type CapabilitiesUploadType = Record<string, never>;
 
 type StickerPackManifestType = Uint8Array;