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

storage: Don't throw if we store undefined

Browse source
This commit is contained in:
Scott Nonnenberg 2020-10-07 17:46:52 -07:00 • committed by Josh Perez
parent c7308b485b
commit 358ee4ab72
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/storage.js
View file

@ -13,7 +13,7 @@
async function put(key, value) { async function put(key, value) {
if (value === undefined) { if (value === undefined) {
throw new Error('Tried to store undefined'); window.log.warn(`storage/put: undefined provided for key ${key}`);
} }
if (!ready) { if (!ready) {
window.log.warn('Called storage.put before storage is ready. key:', key); window.log.warn('Called storage.put before storage is ready. key:', key);

8
ts/background.ts
View file

@ -2896,19 +2896,19 @@ type WhatIsThis = typeof window.WhatIsThis;
// These two bits of data are important to ensure that the app loads up // These two bits of data are important to ensure that the app loads up
// the conversation list, instead of showing just the QR code screen. // the conversation list, instead of showing just the QR code screen.
window.Signal.Util.Registration.markEverDone(); window.Signal.Util.Registration.markEverDone();
window.textsecure.storage.put(NUMBER_ID_KEY, previousNumberId); await window.textsecure.storage.put(NUMBER_ID_KEY, previousNumberId);
// These two are important to ensure we don't rip through every message // These two are important to ensure we don't rip through every message
// in the database attempting to upgrade it after starting up again. // in the database attempting to upgrade it after starting up again.
window.textsecure.storage.put( await window.textsecure.storage.put(
IS_MIGRATION_COMPLETE_KEY, IS_MIGRATION_COMPLETE_KEY,
isMigrationComplete || false isMigrationComplete || false
); );
window.textsecure.storage.put( await window.textsecure.storage.put(
LAST_PROCESSED_INDEX_KEY, LAST_PROCESSED_INDEX_KEY,
lastProcessedIndex || null lastProcessedIndex || null
); );
window.textsecure.storage.put(VERSION_KEY, window.getVersion()); await window.textsecure.storage.put(VERSION_KEY, window.getVersion());
window.log.info('Successfully cleared local configuration'); window.log.info('Successfully cleared local configuration');
} catch (eraseError) { } catch (eraseError) {