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

Process manifest before persisting its version

Browse source
This commit is contained in:
Fedor Indutny 2022-01-04 07:22:48 -08:00 • committed by GitHub
parent 868092ac5f
commit 14861aff50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/services/storage.ts
View file

@ -1046,6 +1046,8 @@ async function sync(
} }
const localManifestVersion = manifestFromStorage || 0; const localManifestVersion = manifestFromStorage || 0;
log.info(`storageService.sync: fetching ${localManifestVersion}`);
manifest = await fetchManifest(localManifestVersion); manifest = await fetchManifest(localManifestVersion);
// Guarding against no manifests being returned, everything should be ok // Guarding against no manifests being returned, everything should be ok
@ -1064,9 +1066,12 @@ async function sync(
`storageService.sync: manifest versions - previous: ${localManifestVersion}, current: ${version}` `storageService.sync: manifest versions - previous: ${localManifestVersion}, current: ${version}`
); );
const hasConflicts = await processManifest(manifest);
log.info(`storageService.sync: storing new manifest version ${version}`);
window.storage.put('manifestVersion', version); window.storage.put('manifestVersion', version);
const hasConflicts = await processManifest(manifest);
if (hasConflicts && !ignoreConflicts) { if (hasConflicts && !ignoreConflicts) {
await upload(true); await upload(true);
} }