summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-01-30 12:25:49 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-01-30 12:25:49 +0100
commit9896b15ec89750263dbb1defb5938c3aede6f948 (patch)
treee884561d5069d46bba92e7f8a4e96def6e0ae00a /apps
parent4fcdfbf5de5496cf1fc683b6a2f4c55764de8e02 (diff)
downloadnextcloud-server-9896b15ec89750263dbb1defb5938c3aede6f948.tar.gz
nextcloud-server-9896b15ec89750263dbb1defb5938c3aede6f948.zip
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 <roeland@famdouma.nl>
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index b5333f48374..f36ebe5636c 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';
+ });
}
}