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

Shared folder history

Browse Source
This commit is contained in:
yflory
2019-06-17 14:13:06 +02:00
parent ba877ba459
commit 04d8578f4e
6 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,9 +537,12 @@ define([
sframeChan.on('Q_GET_HISTORY_RANGE', function (data, cb) {
var nSecret = secret;
if (cfg.isDrive) {
// Shared folder or user hash or fs hash
var hash = Utils.LocalStore.getUserHash() || Utils.LocalStore.getFSHash();
if (data.sharedFolder) { hash = data.sharedFolder.hash; }
if (hash) {
nSecret = Utils.Hash.getSecrets('drive', hash);
var password = (data.sharedFolder && data.sharedFolder.password) || undefined;
nSecret = Utils.Hash.getSecrets('drive', hash, password);
}
}
var channel = nSecret.channel;