From 2eef1e96e60f9104d9c8213aa94e1a1f40c7c0a9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Feb 2018 10:21:15 +0100
Subject: [PATCH 1/4] Remove invalid error reports

---
 www/common/outer/userObject.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index 12d6d225e..dadbfb463 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -104,9 +104,13 @@ define([
                             fd.owners && fd.owners.indexOf(edPublic) !== -1 && channelId) {
                         removeOwnedChannel(channelId, function (obj) {
                             if (obj && obj.error) {
-                                console.error(obj.error);
+                                // If the error is that the file is already removed, nothing to
+                                // report, it's a normal behavior (pad expired probably)
+                                if (obj.error.code === 'ENOENT') { return; }
+
                                 // RPC may not be responding
                                 // Send a report that can be handled manually
+                                console.error(obj.error);
                                 Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId, true);
                             }
                         });

From 5f50bedce2a5b24b1ff6f25d248d9dd74d1aae70 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Feb 2018 14:42:11 +0100
Subject: [PATCH 2/4] Fix empty properties for readonly pads

---
 www/common/common-ui-elements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 1d41d8308..462c806fb 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -141,7 +141,7 @@ define([
     };
     var getPadProperties = function (common, data, cb) {
         var $d = $('<div>');
-        if (!data || !data.href) { return void cb(void 0, $d); }
+        if (!data || (!data.href && !data.roHref)) { return void cb(void 0, $d); }
 
         if (data.href) {
             $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);

From 7ff9bbe2b0206d084fe7c9987f64b4291b0892f3 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Feb 2018 12:43:06 +0100
Subject: [PATCH 3/4] Fix share modal with new pads

---
 www/common/common-ui-elements.js  | 4 ++++
 www/common/sframe-common-outer.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 462c806fb..27c583e08 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -378,6 +378,10 @@ define([
             if (val.present) { $(link).find('#cp-share-present').attr('checked', true); }
             $(link).find('#cp-share-link-preview').val(getLinkValue(val));
         });
+        common.getMetadataMgr().onChange(function () {
+            hashes = common.getMetadataMgr().getPrivateData().availableHashes;
+            $(link).find('#cp-share-link-preview').val(getLinkValue());
+        });
         return tabs;
     };
     UIElements.createFileShareModal = function (config) {
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 57261372d..70d1f72ac 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -625,6 +625,7 @@ define([
                 // Update metadata values and send new metadata inside
                 parsed = Utils.Hash.parsePadUrl(window.location.href);
                 defaultTitle = Utils.Hash.getDefaultName(parsed);
+                hashes = Utils.Hash.getHashes(secret.channel, secret);
                 readOnly = false;
                 updateMeta();
 

From 61dbf94f2d8079bcf0fe763f7454df0c8d1426e8 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Feb 2018 15:56:23 +0100
Subject: [PATCH 4/4] Fix pad attributes not working for readonly pads if you
 know the edit hash

---
 www/common/sframe-common-outer.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 70d1f72ac..260efeda9 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -331,17 +331,27 @@ define([
             });
 
             sframeChan.on('Q_GET_PAD_ATTRIBUTE', function (data, cb) {
+                var href;
+                if (readOnly && hashes.editHash) {
+                    // If we have a stronger hash, use it for pad attributes
+                    href = window.location.pathname + '#' + hashes.editHash;
+                }
                 Cryptpad.getPadAttribute(data.key, function (e, data) {
                     cb({
                         error: e,
                         data: data
                     });
-                });
+                }, href);
             });
             sframeChan.on('Q_SET_PAD_ATTRIBUTE', function (data, cb) {
+                var href;
+                if (readOnly && hashes.editHash) {
+                    // If we have a stronger hash, use it for pad attributes
+                    href = window.location.pathname + '#' + hashes.editHash;
+                }
                 Cryptpad.setPadAttribute(data.key, data.value, function (e) {
                     cb({error:e});
-                });
+                }, href);
             });
 
             sframeChan.on('Q_GET_ATTRIBUTE', function (data, cb) {