From 9896b15ec89750263dbb1defb5938c3aede6f948 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 30 Jan 2018 12:25:49 +0100 Subject: [PATCH] Only handle encrypted property on folders Exposing the encrypted property is required for E2E. However, there is no need to expose this on files as then it is server side encryption (which the clients don't care about). Better to not confuse the output. Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Connector/Sabre/FilesPlugin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index b5333f4837..f36ebe5636 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -339,10 +339,6 @@ class FilesPlugin extends ServerPlugin { } }); - $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) { - return $node->getFileInfo()->isEncrypted() ? '1' : '0'; - }); - $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) { return json_encode($this->previewManager->isAvailable($node->getFileInfo())); }); @@ -391,6 +387,10 @@ class FilesPlugin extends ServerPlugin { $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) { return $node->getSize(); }); + + $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) { + return $node->getFileInfo()->isEncrypted() ? '1' : '0'; + }); } }