fixed webdav errors, now webdav up - and downloads are full working

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 88ec64b492d9bc4f487928eb98c3be1b277bab09..2ac74ad6c44c5b9187a129bd1027109e4603a55b 100644 (file)
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -40,7 +40,8 @@ class Hooks {
        \r
                // Manually initialise Filesystem{} singleton with correct \r
                // fake root path, in order to avoid fatal webdav errors\r
-               \OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );\r
+        // NOTE: disabled because this give errors on webdav!\r
+               //\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );\r
        \r
                $view = new \OC_FilesystemView( '/' );\r
 \r
@@ -66,8 +67,10 @@ class Hooks {
                $session = new Session( $view );\r
                \r
                $session->setPrivateKey( $privateKey, $params['uid'] );\r
-               \r
-               $view1 = new \OC_FilesystemView( '/' . $params['uid'] );\r
+\r
+        //FIXME: disabled because it gets called each time a user do an operation on iPhone\r
+        //FIXME: we need a better place doing this and maybe only one time or by user\r
+               /*$view1 = new \OC_FilesystemView( '/' . $params['uid'] );\r
                \r
                // Set legacy encryption key if it exists, to support \r
                // depreciated encryption system\r
@@ -86,12 +89,12 @@ class Hooks {
                \r
                $publicKey = Keymanager::getPublicKey( $view, $params['uid'] );\r
                \r
-               \OC_FileProxy::$enabled = false;\r
+               \OC_FileProxy::$enabled = false;*/\r
                \r
                // Encrypt existing user files:\r
                // This serves to upgrade old versions of the encryption\r
                // app (see appinfo/spec.txt)\r
-               if ( \r
+               /*if (\r
                        $util->encryptAll( $publicKey,  '/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'] )\r
                ) {\r
                        \r
@@ -100,7 +103,7 @@ class Hooks {
                                , \OC_Log::INFO \r
                        );\r
                \r
-               }\r
+               }*/\r
 \r
                return true;\r
 \r