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

Ensure that all messages in cache are migrated properly

Browse source
This commit is contained in:
Scott Nonnenberg 2018-08-06 12:11:02 -07:00
parent 9ff80469a5
commit 44dec45995
3 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/background.js
View file

@ -338,6 +338,7 @@
db,
clearStores: Whisper.Database.clearStores,
handleDOMException: Whisper.Database.handleDOMException,
arrayBufferToString: textsecure.MessageReceiver.arrayBufferToString,
countCallback: count => {
window.log.info(`Migration: ${count} messages complete`);
showMigrationStatus(count);

22
js/modules/migrate_to_sql.js
View file

@ -1,6 +1,6 @@
/* global window, IDBKeyRange */
const { includes, isFunction, isString, last } = require('lodash');
const { includes, isFunction, isString, last, forEach } = require('lodash');
const {
saveMessages,
_removeMessages,
@ -25,6 +25,7 @@ async function migrateToSQL({
clearStores,
handleDOMException,
countCallback,
arrayBufferToString,
}) {
if (!db) {
throw new Error('Need db for IndexedDB connection!');
@ -32,6 +33,9 @@ async function migrateToSQL({
if (!isFunction(clearStores)) {
throw new Error('Need clearStores function!');
}
if (!isFunction(arrayBufferToString)) {
throw new Error('Need arrayBufferToString function!');
}
if (!isFunction(handleDOMException)) {
throw new Error('Need handleDOMException function!');
}
@ -78,7 +82,21 @@ async function migrateToSQL({
// eslint-disable-next-line no-await-in-loop
const status = await migrateStoreToSQLite({
db,
save: saveUnprocesseds,
save: async array => {
forEach(array, item => {
// In the new database, we can't store ArrayBuffers, so we turn these two fields
// into strings like MessageReceiver now does before save.
if (item.envelope) {
// eslint-disable-next-line no-param-reassign
item.envelope = arrayBufferToString(item.envelope);
}
if (item.decrypted) {
// eslint-disable-next-line no-param-reassign
item.decrypted = arrayBufferToString(item.decrypted);
}
});
await saveUnprocesseds(array);
},
remove: removeUnprocessed,
storeName: 'unprocessed',
handleDOMException,