web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Drive history

Browse Source
This commit is contained in:
yflory 2018-07-19 17:07:14 +02:00
parent 8b20b14184
commit 2be78deb93
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/common/sframe-common-outer.js
View File

@ -421,10 +421,19 @@ define([
}); });
}); });
sframeChan.on('Q_GET_HISTORY_RANGE', function (data, cb) { sframeChan.on('Q_GET_HISTORY_RANGE', function (data, cb) {
var crypto = Crypto.createEncryptor(secret.keys); var nSecret = secret;
if (cfg.isDrive) {
var hash = Utils.LocalStore.getUserHash() || Utils.LocalStore.getFSHash();
if (hash) {
nSecret = Utils.Hash.getSecrets('drive', hash);
}
}
var channel = nSecret.channel;
var validate = nSecret.keys.validateKey;
var crypto = Crypto.createEncryptor(nSecret.keys);
Cryptpad.getHistoryRange({ Cryptpad.getHistoryRange({
channel: secret.channel, channel: channel,
validateKey: secret.keys.validateKey, validateKey: validate,
lastKnownHash: data.lastKnownHash lastKnownHash: data.lastKnownHash
}, function (data) { }, function (data) {
cb({ cb({

3
www/drive/main.js
View File

@ -102,7 +102,8 @@ define([
noHash: true, noHash: true,
noRealtime: true, noRealtime: true,
driveEvents: true, driveEvents: true,
addRpc: addRpc addRpc: addRpc,
isDrive: true,
}); });
}); });
}); });