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

Improve check in storage service comparator

Browse source
This commit is contained in:
Fedor Indutny 2025-01-08 18:23:13 -08:00 • committed by GitHub
parent a384b40e63
commit 3a1addbfe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ts/services/storageRecordOps.ts
View file

@ -748,20 +748,28 @@ function doRecordsConflict(
continue;
}
const isRemoteNullish =
!remoteValue || (Long.isLong(remoteValue) && remoteValue.isZero());
const isLocalNullish =
!localValue || (Long.isLong(localValue) && localValue.isZero());
// Sometimes we get `null` values from Protobuf and they should default to
// false, empty string, or 0 for these records we do not count them as
// conflicting.
if (
(!remoteValue || (Long.isLong(remoteValue) && remoteValue.isZero())) &&
(!localValue || (Long.isLong(localValue) && localValue.isZero()))
) {
if (isRemoteNullish && isLocalNullish) {
continue;
}
const areEqual = isEqual(localValue, remoteValue);
if (!areEqual) {
details.push(`key=${key}: different values`);
if (isRemoteNullish) {
details.push(`key=${key}: removed`);
} else if (isLocalNullish) {
details.push(`key=${key}: added`);
} else {
details.push(`key=${key}: different values`);
}
}
}