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

Fixes for Chrome app import in this new SQLCipher world

Browse source
This commit is contained in:
Scott Nonnenberg 2018-08-02 11:01:36 -07:00
parent baf419b7b6
commit 3961778e53
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/modules/backup.js
View file

@ -983,8 +983,6 @@ async function loadAttachments(dir, getName, options) {
); );
// TODO: Handle video screenshots, and image/video thumbnails // TODO: Handle video screenshots, and image/video thumbnails
window.log.info('loadAttachments', { message });
} }
function saveMessage(db, message) { function saveMessage(db, message) {
@ -1008,7 +1006,9 @@ async function saveAllMessages(db, rawMessages) {
for (let index = 0, max = messages.length; index < max; index += 1) { for (let index = 0, max = messages.length; index < max; index += 1) {
// Yes, we really want to do these in order // Yes, we really want to do these in order
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await window.Signal.Data.saveMessage(messages[index]); await window.Signal.Data.saveMessage(messages[index], {
forceSave: true,
});
} }
window.log.info( window.log.info(

5
js/views/import_view.js
View file

@ -38,7 +38,10 @@
return storage.put(IMPORT_LOCATION, location); return storage.put(IMPORT_LOCATION, location);
}, },
reset() { reset() {
return Whisper.Database.clear(); return Promise.all([
Whisper.Database.clear(),
Window.Signal.Data.removeAll(),
]);
}, },
}; };