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

lib/hk-util.js

@@ -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);

www/common/common-ui-elements.js

@@ -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;

www/common/sframe-common.js

@@ -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) {

www/settings/inner.js

@@ -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);