From f42574948e80bbb25f869a65b8681121a96dc9aa Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 8 Nov 2019 12:07:08 +0100
Subject: [PATCH] Encrypt href for new pads in old shared folders

---
 www/common/outer/sharedfolder.js | 2 +-
 www/common/proxy-manager.js      | 7 -------
 www/common/userObject.js         | 4 ----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js
index 60ef8dd9a..47cfe5458 100644
--- a/www/common/outer/sharedfolder.js
+++ b/www/common/outer/sharedfolder.js
@@ -59,7 +59,7 @@ define([
         });
     };
 
-    // XXX only needed if we want a manual migration from the share modal...
+    // SFMIGRATION: only needed if we want a manual migration from the share modal...
     SF.migrate = function (channel) {
         var sf = allSharedFolders[channel];
         if (!sf) { return; }
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 4c5e2d2e4..1bd88e90b 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -39,13 +39,6 @@ define([
             userObject: userObject,
             leave: leave
         };
-        if (false) { // XXX allow shared folder migration while using it
-            // NOTE: this is not needed if we always use the editKey in userObject, even with old version
-            var path = proxy.drive ? ['drive', 'version'] : ['version'];
-            proxy.on('change', path, function () {
-                userObject.setReadOnly(false, editKey);
-            });
-        }
         return userObject;
     };
 
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 57c1a1e6e..7ac1bfe88 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -105,10 +105,6 @@ define([
     module.init = function (files, config) {
         var exp = {};
 
-        if (false && !files.version) { // XXX if we remove false, old shared folders won't encrypt new hrefs
-            config.editKey = undefined;
-        }
-
         exp.cryptor = createCryptor(config.editKey);
 
         exp.setReadOnly = function (state, key) {