fix parameter declaration and class initialisation

diff --git a/apps/encryption/appinfo/encryption.php b/apps/encryption/appinfo/encryption.php
index dd8004a48803f68b36fd00a05b5dad7784cedc2a..6aad921902572ad8f15bb5e8453d06d713d5dbb0 100644 (file)
--- a/apps/encryption/appinfo/encryption.php
+++ b/apps/encryption/appinfo/encryption.php
@@ -85,7 +85,8 @@ class Encryption extends \OCP\AppFramework\App {
                                        $container->query('UserSetup'),
                                        $server->getUserSession(),
                                        new \OCP\Util(),
-                                       $container->query('Util')),
+                                       $container->query('Util'),
+                                       $server->getSession()),
                        ]);
 
                        $hookManager->fireHooks();

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 8c00077729e9efa3b4e61e9677cf6872e43177ed..3c93f75940704de4a9dd871c4eeba64e98c5616c 100644 (file)
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -46,16 +46,16 @@ class Encryption implements IEncryptionModule {
        /** @var boolean */
        private $isWriteOperation;
 
-       /** @var \OC\Encryption\Util */
+       /** @var \OCA\Encryption\Util */
        private $util;
 
        /**
         *
         * @param \OCA\Encryption\Crypto\Crypt $crypt
         * @param KeyManager $keymanager
-        * @param \OC\Encryption\Util $util
+        * @param \OCA\Encryption\Util $util
         */
-       public function __construct(Crypt $crypt, KeyManager $keymanager, \OC\Encryption\Util $util) {
+       public function __construct(Crypt $crypt, KeyManager $keymanager, \OCA\Encryption\Util $util) {
                $this->crypt = $crypt;
                $this->keymanager = $keymanager;
                $this->util = $util;