natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:mozilla/send into frontend_tests

This commit is contained in:
Abhinav Adduri 2017-07-17 10:52:27 -07:00
parent 188521f985 2cf2fcebc9
commit ba348b6839
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/fileReceiver.js
View File

@ -74,9 +74,7 @@ class FileReceiver extends EventEmitter {
fdata.data fdata.data
).then(decrypted => { ).then(decrypted => {
this.emit('decrypting', false); this.emit('decrypting', false);
return new Promise((resolve, reject) => { return Promise.resolve(decrypted)
resolve(decrypted);
})
}), }),
fdata.filename, fdata.filename,
hexToArray(fdata.aad) hexToArray(fdata.aad)