Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-25 04:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Impliclity decrypt data if key is present

Browse Source
This commit is contained in:
Daniel Gasienica
2018-04-03 22:47:23 -04:00
parent 94c75762b5
commit a61c905146
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/modules/backup.js
View File

@@ -455,7 +455,7 @@ function _getAnonymousAttachmentFileName(message, index) {
async function readAttachment(dir, attachment, name, options) {
options = options || {};
const { key, encrypted } = options;
const { key } = options;
const anonymousName = _sanitizeFileName(name);
const targetPath = path.join(dir, anonymousName);
@@ -467,7 +467,8 @@ async function readAttachment(dir, attachment, name, options) {
const data = await readFileAsArrayBuffer(targetPath);
if (encrypted && key) {
const isEncrypted = !_.isUndefined(key);
if (isEncrypted) {
attachment.data = await crypto.decryptSymmetric(key, data);
} else {
attachment.data = data;
@@ -1208,9 +1209,7 @@ async function importFromDirectory(directory, options) {
attachmentsDir,
});
const result = await importNonMessages(db, stagingDir, options);
await importConversations(db, stagingDir, Object.assign({}, options, {
encrypted: true,
}));
await importConversations(db, stagingDir, Object.assign({}, options));
console.log('Done importing from backup!');
return result;