don't try to encrypt/decrypt cache chunks or files in the trash bin

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 41f352d853a3d31be234f462807d5116a709dfc9..4fe76b9771174c83e5b613c28bbd961f4dbe77e1 100644 (file)
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -255,8 +255,8 @@ class Proxy extends \OC_FileProxy {
                // split the path parts
                $pathParts = explode('/', $path);
 
-               // FIXME: handling for /userId/cache used by webdav for chunking. The cache chunks are NOT encrypted
-               if (isset($pathParts[2]) && $pathParts[2] === 'cache') {
+               // don't try to encrypt/decrypt cache chunks or files in the trash bin
+               if (isset($pathParts[2]) && ($pathParts[2] === 'cache' || $pathParts[2] === 'files_trashbin')) {
                        return $result;
                }