diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index f2262db5e1..2bc5dad310 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -20,8 +20,6 @@ export type ConfigKeyType = | 'desktop.calling.raiseHand' | 'desktop.clientExpiration' | 'desktop.backup.credentialFetch' - | 'desktop.deleteSync.send' - | 'desktop.deleteSync.receive' | 'desktop.internalUser' | 'desktop.mediaQuality.levels' | 'desktop.messageCleanup' diff --git a/ts/background.ts b/ts/background.ts index 33958caf67..3c1b96b10b 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -205,7 +205,6 @@ import { queueSyncTasks } from './util/syncTasks'; import type { ViewSyncTaskType } from './messageModifiers/ViewSyncs'; import type { ReceiptSyncTaskType } from './messageModifiers/MessageReceipts'; import type { ReadSyncTaskType } from './messageModifiers/ReadSyncs'; -import { isEnabled } from './RemoteConfig'; import { AttachmentBackupManager } from './jobs/AttachmentBackupManager'; import { getConversationIdForLogging } from './util/idForLogging'; import { encryptConversationAttachments } from './util/encryptConversationAttachments'; @@ -3559,11 +3558,6 @@ export async function startApp(): Promise { const { confirm, timestamp, envelopeId, deleteForMeSync } = ev; const logId = `onDeleteForMeSync(${timestamp})`; - if (!isEnabled('desktop.deleteSync.receive')) { - confirm(); - return; - } - // The user clearly knows about this feature; they did it on another device! drop(window.storage.put('localDeleteWarningShown', true)); diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts index 02987dd71c..4eb9541a8f 100644 --- a/ts/models/conversations.ts +++ b/ts/models/conversations.ts @@ -177,7 +177,6 @@ import { getConversationToDelete, getMessageToDelete, } from '../util/deleteForMe'; -import { isEnabled } from '../RemoteConfig'; import { getCallHistorySelector } from '../state/selectors/callHistory'; /* eslint-disable more/no-then */ @@ -5049,11 +5048,7 @@ export class ConversationModel extends window.Backbone 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) { 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 d154b28991..c8073c9321 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -195,7 +195,6 @@ import { getMessageToDelete, } from '../../util/deleteForMe'; import { MAX_MESSAGE_COUNT } from '../../util/deleteForMe.types'; -import { isEnabled } from '../../RemoteConfig'; import { markCallHistoryReadInConversation } from './callHistory'; import type { CapabilitiesType } from '../../textsecure/WebAPI'; @@ -1778,7 +1777,7 @@ function deleteMessages({ window.ConversationController.getOurConversationOrThrow(); const capable = Boolean(ourConversation.get('capabilities')?.deleteSync); - if (!capable || !isEnabled('desktop.deleteSync.send')) { + if (!capable) { return; } if (messages.length === 0) { diff --git a/ts/state/selectors/items-extra.ts b/ts/state/selectors/items-extra.ts index ea5245210e..b3253548b8 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 true; } );