Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

8 years ago · 408a4dad94
parent 3964f4feee dd73ad2dd5
commit 408a4dad94
1 changed files with 3 additions and 0 deletions
--- a/www/file/main.js
+++ b/www/file/main.js
@ -258,6 +258,8 @@ define([
                var src = Cryptpad.getBlobPathFromHex(hexFileName);
                return Cryptpad.fetch(src, function (e, u8) {
                    if (e) { return void Cryptpad.alert(e); }
+
+
                    // now decrypt the u8
                    var cryptKey = secret.keys && secret.keys.fileKeyStr;
                    var key = Nacl.util.decodeBase64(cryptKey);
@ -266,6 +268,7 @@ define([
                        return void Cryptpad.errorLoadingScreen(e);
                    }

+                    return console.error(FileCrypto.decryptMetadata(u8, key));
                    FileCrypto.decrypt(u8, key, function (e, data) {
                        if (e) {
                            return console.error(e);