Disable local delete sync
This commit is contained in:
parent
7a7f484796
commit
71d6891132
5 changed files with 9 additions and 23 deletions
|
@ -1837,9 +1837,7 @@ export async function startApp(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// Note: we always have to register our capabilities all at once, so we do this
|
// Note: we always have to register our capabilities all at once, so we do this
|
||||||
// after connect on every startup
|
// after connect on every startup
|
||||||
await server.registerCapabilities({
|
await server.registerCapabilities({});
|
||||||
deleteSync: true,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
log.error(
|
log.error(
|
||||||
'Error: Unable to register our capabilities.',
|
'Error: Unable to register our capabilities.',
|
||||||
|
|
|
@ -170,7 +170,6 @@ import {
|
||||||
getConversationToDelete,
|
getConversationToDelete,
|
||||||
getMessageToDelete,
|
getMessageToDelete,
|
||||||
} from '../util/deleteForMe';
|
} from '../util/deleteForMe';
|
||||||
import { isEnabled } from '../RemoteConfig';
|
|
||||||
import { getCallHistorySelector } from '../state/selectors/callHistory';
|
import { getCallHistorySelector } from '../state/selectors/callHistory';
|
||||||
|
|
||||||
/* eslint-disable more/no-then */
|
/* eslint-disable more/no-then */
|
||||||
|
@ -5014,14 +5013,11 @@ export class ConversationModel extends window.Backbone
|
||||||
});
|
});
|
||||||
window.Signal.Data.updateConversation(this.attributes);
|
window.Signal.Data.updateConversation(this.attributes);
|
||||||
|
|
||||||
|
const enabled = false;
|
||||||
const ourConversation =
|
const ourConversation =
|
||||||
window.ConversationController.getOurConversationOrThrow();
|
window.ConversationController.getOurConversationOrThrow();
|
||||||
const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
|
const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
|
||||||
if (
|
if (source === 'local-delete' && capable && enabled) {
|
||||||
source === 'local-delete' &&
|
|
||||||
capable &&
|
|
||||||
isEnabled('desktop.deleteSync.send')
|
|
||||||
) {
|
|
||||||
log.info(`${logId}: Preparing sync message`);
|
log.info(`${logId}: Preparing sync message`);
|
||||||
const timestamp = Date.now();
|
const timestamp = Date.now();
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,6 @@ import {
|
||||||
getMessageToDelete,
|
getMessageToDelete,
|
||||||
} from '../../util/deleteForMe';
|
} from '../../util/deleteForMe';
|
||||||
import { MAX_MESSAGE_COUNT } from '../../util/deleteForMe.types';
|
import { MAX_MESSAGE_COUNT } from '../../util/deleteForMe.types';
|
||||||
import { isEnabled } from '../../RemoteConfig';
|
|
||||||
import type { CapabilitiesType } from '../../textsecure/WebAPI';
|
import type { CapabilitiesType } from '../../textsecure/WebAPI';
|
||||||
|
|
||||||
// State
|
// State
|
||||||
|
@ -1768,8 +1767,9 @@ function deleteMessages({
|
||||||
const ourConversation =
|
const ourConversation =
|
||||||
window.ConversationController.getOurConversationOrThrow();
|
window.ConversationController.getOurConversationOrThrow();
|
||||||
const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
|
const capable = Boolean(ourConversation.get('capabilities')?.deleteSync);
|
||||||
|
const enabled = false;
|
||||||
|
|
||||||
if (!capable || !isEnabled('desktop.deleteSync.send')) {
|
if (!capable || !enabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (messages.length === 0) {
|
if (messages.length === 0) {
|
||||||
|
|
|
@ -5,20 +5,16 @@ import { createSelector } from 'reselect';
|
||||||
|
|
||||||
import { getUserACI } from './user';
|
import { getUserACI } from './user';
|
||||||
import { getConversationSelector } from './conversations';
|
import { getConversationSelector } from './conversations';
|
||||||
import { getRemoteConfig, isRemoteConfigFlagEnabled } from './items';
|
|
||||||
|
|
||||||
import type { AciString } from '../../types/ServiceId';
|
import type { AciString } from '../../types/ServiceId';
|
||||||
import type { ConfigMapType } from '../../RemoteConfig';
|
|
||||||
import type { GetConversationByIdType } from './conversations';
|
import type { GetConversationByIdType } from './conversations';
|
||||||
|
|
||||||
export const getDeleteSyncSendEnabled = createSelector(
|
export const getDeleteSyncSendEnabled = createSelector(
|
||||||
getUserACI,
|
getUserACI,
|
||||||
getConversationSelector,
|
getConversationSelector,
|
||||||
getRemoteConfig,
|
|
||||||
(
|
(
|
||||||
aci: AciString | undefined,
|
aci: AciString | undefined,
|
||||||
conversationSelector: GetConversationByIdType,
|
conversationSelector: GetConversationByIdType
|
||||||
remoteConfig: ConfigMapType
|
|
||||||
): boolean => {
|
): boolean => {
|
||||||
if (!aci) {
|
if (!aci) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -33,6 +29,6 @@ export const getDeleteSyncSendEnabled = createSelector(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return isRemoteConfigFlagEnabled(remoteConfig, 'desktop.deleteSync.send');
|
return false;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -703,12 +703,8 @@ export type WebAPIConnectType = {
|
||||||
connect: (options: WebAPIConnectOptionsType) => WebAPIType;
|
connect: (options: WebAPIConnectOptionsType) => WebAPIType;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type CapabilitiesType = {
|
export type CapabilitiesType = Record<string, never>;
|
||||||
deleteSync: boolean;
|
export type CapabilitiesUploadType = Record<string, never>;
|
||||||
};
|
|
||||||
export type CapabilitiesUploadType = {
|
|
||||||
deleteSync: true;
|
|
||||||
};
|
|
||||||
|
|
||||||
type StickerPackManifestType = Uint8Array;
|
type StickerPackManifestType = Uint8Array;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue