web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shared folders not removed from memory in inner

Browse Source
This commit is contained in:
yflory
2019-11-12 17:08:29 +01:00
parent bfd46fb570
commit 80f5ebc0cc
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
www/drive/inner.js
View File

@@ -58,6 +58,14 @@ define([
APP.newSharedFolder = null; APP.newSharedFolder = null;
} }
} }
if (newObj && newObj.deprecated) {
delete folders[fId];
delete drive.sharedFolders[fId];
if (manager && manager.folders) {
delete manager.folders[fId];
}
return;
}
folders[fId] = folders[fId] || {}; folders[fId] = folders[fId] || {};
copyObjectValue(folders[fId], newObj); copyObjectValue(folders[fId], newObj);
folders[fId].readOnly = !secret.keys.secondaryKey; folders[fId].readOnly = !secret.keys.secondaryKey;
@@ -69,6 +77,15 @@ define([
manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey); manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey);
})); }));
}); });
oldIds.forEach(function (fId) {
if (!drive.sharedFolders[fId]) {
delete folders[fId];
delete drive.sharedFolders[fId];
if (manager && manager.folders) {
delete manager.folders[fId];
}
}
});
}).nThen(function () { }).nThen(function () {
cb(); cb();
}); });

10
www/teams/inner.js
View File

@@ -80,6 +80,16 @@ define([
manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey); manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey);
})); }));
}); });
// Remove from memory folders that have been deleted from the drive remotely
oldIds.forEach(function (fId) {
if (!drive.sharedFolders[fId]) {
delete folders[fId];
delete drive.sharedFolders[fId];
if (manager && manager.folders) {
delete manager.folders[fId];
}
}
});
}).nThen(function () { }).nThen(function () {
cb(); cb();
}); });