From 86144eda22ed94d55936863598577b998aad2c0a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 26 Jan 2018 12:26:58 +0100
Subject: [PATCH] Display a message about pads deleted from the server

---
 customize.dist/translations/messages.fr.js | 1 +
 customize.dist/translations/messages.js    | 1 +
 www/common/outer/async-store.js            | 4 ++--
 www/drive/inner.js                         | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 83e652588..a9aa54448 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -415,6 +415,7 @@ define(function () {
                            "Cette action supprimera votre CryptDrive et son historique de votre navigateur, mais les pads existeront toujours (de manière chiffrée) sur notre serveur.";
     out.fm_padIsOwned = "Vous êtes le propriétaire de ce pad";
     out.fm_padIsOwnedOther = "Ce pad est la propriété d'un autre utilisateur";
+    out.fm_deletedPads = "Ces pads n'existent plus sur le serveur, ils ont été supprimés de votre CryptDrive: {0}";
     // File - Context menu
     out.fc_newfolder = "Nouveau dossier";
     out.fc_rename = "Renommer";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f096341b6..551e36516 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -417,6 +417,7 @@ define(function () {
                            "This will remove your CryptDrive and its history from your browser, but your pads will still exist (encrypted) on our server.";
     out.fm_padIsOwned = "You are the owner of this pad";
     out.fm_padIsOwnedOther = "This pad is owned by another user";
+    out.fm_deletedPads = "These pads no longer exist on the server, they've been removed from your CryptDrive: {0}";
     // File - Context menu
     out.fc_newfolder = "New folder";
     out.fc_rename = "Rename";
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 5c135a3fb..d8fb6ef3b 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -102,8 +102,8 @@ define([
 
             // Push channels owned by someone else or channel that should have expired
             // because of the expiration time
-            if ((data.owners && data.owners.indexOf(edPublic) === -1) ||
-                    data.expire < (+new Date())) {
+            if ((data.owners && data.owners.length && data.owners.indexOf(edPublic) === -1) ||
+                    (data.expire && data.expire < (+new Date()))) {
                 list.push(Hash.hrefToHexChannelId(data.href));
             }
         });
diff --git a/www/drive/inner.js b/www/drive/inner.js
index afdf8165c..ba1c8c4d8 100644
--- a/www/drive/inner.js
+++ b/www/drive/inner.js
@@ -1435,6 +1435,7 @@ define([
                 case FILES_DATA: pName = FILES_DATA_NAME; break;
                 case SEARCH: pName = SEARCH_NAME; break;
                 case RECENT: pName = RECENT_NAME; break;
+                case OWNED: pName = OWNED_NAME; break;
                 default: pName = name;
             }
             return pName;
@@ -2978,10 +2979,15 @@ define([
 
         sframeChan.query('Q_DRIVE_GETDELETED', null, function (err, data) {
             var ids = filesOp.findChannels(data);
+            var titles = [];
             ids.forEach(function (id) {
+                var title = filesOp.getTitle(id);
+                titles.push(title);
                 var paths = filesOp.findFile(id);
                 filesOp.delete(paths, refresh);
             });
+            if (!titles.length) { return; }
+            UI.log(Messages._getKey('fm_deletedPads', [titles.join(', ')]));
         });
     };