infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
ansuz 2020-12-08 16:57:13 +05:30
parent e6a4c68863 34284fcc0c
commit 66195a17a1
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/hk-util.js
View File

@ -438,13 +438,12 @@ const getHistoryOffset = (Env, channelName, lastKnownHash, _cb) => {
to reconcile their differences. */
}
// If our lastKnownHash is older than the 2nd to last checkpoint,
// only send the last 2 checkpoints and ignore "lkh"
// XXX XXX this is probably wrong! ChainPad may not accept checkpoints that are not connected to root
// XXX We probably need to send an EUNKNOWN here so that the client can recreate a new chainpad
/*if (lkh && index.cpIndex.length >= 2 && lkh < index.cpIndex[0].offset) {
return void cb(null, index.cpIndex[0].offset);
}*/
// If our lastKnownHash is older than the 2nd to last checkpoint, send
// EUNKNOWN to tell the user to empty their cache
if (lkh && index.cpIndex.length >= 2 && lkh < index.cpIndex[0].offset) {
waitFor.abort();
return void cb(new Error('EUNKNOWN'));
}
// Otherwise use our lastKnownHash
cb(null, lkh);

1
www/common/common-ui-elements.js
View File

@ -2702,7 +2702,6 @@ define([
var dontShowAgain = function () {
var until = (+new Date()) + (7 * 24 * 3600 * 1000); // 7 days from now
until = (+new Date()) + 30000; // XXX 30s from now
if (data.drive) {
common.setAttribute(['drive', 'trim'], until);
return;

1
www/common/sframe-common.js
View File

@ -290,7 +290,6 @@ define([
var priv = ctx.metadataMgr.getPrivateData();
var limit = 100 * 1024 * 1024; // 100MB
limit = 100 * 1024; // XXX 100KB
var owned;
nThen(function (w) {

2
www/settings/inner.js
View File

@ -955,7 +955,7 @@ define([
cb(content);
};
makeBlock('trim-history', function(cb, $div) {
if (!common.isLoggedIn()) { return; }
if (!common.isLoggedIn()) { return void cb(false); }
redrawTrimHistory(cb, $div);
}, true);