mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Check for conversation conflicts before writing

Browse source
This commit is contained in:
Josh Perez 2021-03-11 20:56:01 -05:00 • committed by Josh Perez
parent 58bdf36254
commit 0fd0fac262
5 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/RemoteConfig.ts
View file

@ -13,7 +13,7 @@ export type ConfigKeyType =
| 'desktop.mandatoryProfileSharing' | 'desktop.mandatoryProfileSharing'
| 'desktop.messageRequests' | 'desktop.messageRequests'
| 'desktop.storage' | 'desktop.storage'
| 'desktop.storageWrite2' | 'desktop.storageWrite3'
| 'global.groupsv2.maxGroupSize' | 'global.groupsv2.maxGroupSize'
| 'global.groupsv2.groupSizeHardLimit'; | 'global.groupsv2.groupSizeHardLimit';
type ConfigValueType = { type ConfigValueType = {

4
ts/models/conversations.ts
View file

@ -4895,9 +4895,9 @@ export class ConversationModel extends window.Backbone.Model<
// [X] archived // [X] archived
// [X] markedUnread // [X] markedUnread
captureChange(logMessage: string): void { captureChange(logMessage: string): void {
if (!window.Signal.RemoteConfig.isEnabled('desktop.storageWrite2')) { if (!window.Signal.RemoteConfig.isEnabled('desktop.storageWrite3')) {
window.log.info( window.log.info(
'conversation.captureChange: Returning early; desktop.storageWrite2 is falsey' 'conversation.captureChange: Returning early; desktop.storageWrite3 is falsey'
); );
return; return;

2
ts/services/storage.ts
View file

@ -127,6 +127,8 @@ async function generateManifest(
isNewManifest isNewManifest
); );
await window.ConversationController.checkForConflicts();
const ITEM_TYPE = window.textsecure.protobuf.ManifestRecord.Identifier.Type; const ITEM_TYPE = window.textsecure.protobuf.ManifestRecord.Identifier.Type;
const conversationsToUpdate = []; const conversationsToUpdate = [];

2
ts/storage/isFeatureEnabled.ts
View file

@ -8,5 +8,5 @@ function isStorageFeatureEnabled(): boolean {
} }
export function isStorageWriteFeatureEnabled(): boolean { export function isStorageWriteFeatureEnabled(): boolean {
return isStorageFeatureEnabled() && isEnabled('desktop.storageWrite2'); return isStorageFeatureEnabled() && isEnabled('desktop.storageWrite3');
} }

6
ts/test-node/components/leftPane/LeftPaneComposeHelper_test.ts
View file

@ -27,7 +27,7 @@ describe('LeftPaneComposeHelper', () => {
.stub(remoteConfig, 'isEnabled') .stub(remoteConfig, 'isEnabled')
.withArgs('desktop.storage') .withArgs('desktop.storage')
.returns(true) .returns(true)
.withArgs('desktop.storageWrite2') .withArgs('desktop.storageWrite3')
.returns(true); .returns(true);
}); });
@ -143,7 +143,7 @@ describe('LeftPaneComposeHelper', () => {
remoteConfigStub remoteConfigStub
.withArgs('desktop.storage') .withArgs('desktop.storage')
.returns(false) .returns(false)
.withArgs('desktop.storageWrite2') .withArgs('desktop.storageWrite3')
.returns(false); .returns(false);
assert.isUndefined( assert.isUndefined(
@ -157,7 +157,7 @@ describe('LeftPaneComposeHelper', () => {
remoteConfigStub remoteConfigStub
.withArgs('desktop.storage') .withArgs('desktop.storage')
.returns(true) .returns(true)
.withArgs('desktop.storageWrite2') .withArgs('desktop.storageWrite3')
.returns(false); .returns(false);
assert.isUndefined( assert.isUndefined(