From 98de385b8adf748bc1f7d9b527b253624575e370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Wed, 10 Apr 2013 15:08:28 +0200
Subject: [PATCH] add $view as parameter for session constructor

---
 apps/files_encryption/appinfo/app.php |  4 ++--
 apps/files_encryption/hooks/hooks.php | 10 +++++-----
 apps/files_encryption/lib/proxy.php   |  4 ++--
 apps/files_encryption/lib/stream.php  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index b095f79c0c..47f4120fb3 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -24,8 +24,8 @@ OCP\Util::connectHook( 'OCP\Share', 'post_unshareAll', 'OCA\Encryption\Hooks', '
 OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfileFromClient' );
 
 stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
-
-$session = new OCA\Encryption\Session();
+$view = new OC\Files\View('/');
+$session = new OCA\Encryption\Session($view);
 
 if ( 
 	! $session->getPrivateKey( \OCP\USER::getUser() )
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 43d3dfb5a6..82de80a1cf 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -63,7 +63,7 @@ class Hooks {
 		
 		$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
 		
-		$session = new Session();
+		$session = new Session($view);
 		
 		$session->setPrivateKey( $privateKey, $params['uid'] );
 		
@@ -116,8 +116,8 @@ class Hooks {
 		// is in use (client-side encryption does not have access to 
 		// the necessary keys)
 		if ( Crypt::mode() == 'server' ) {
-			
-			$session = new Session();
+			$view = new \OC_FilesystemView( '/' );
+			$session = new Session($view);
 			
 			// Get existing decrypted private key
 			$privateKey = $session->getPrivateKey();
@@ -189,7 +189,7 @@ class Hooks {
 		if ( $params['itemType'] === 'file' ) {
 		
 			$view = new \OC_FilesystemView( '/' );
-			$session = new Session();
+			$session = new Session($view);
 			$userId = \OCP\User::getUser();
 			$util = new Util( $view, $userId );
 			$path = $util->fileIdToPath( $params['itemSource'] );
@@ -244,7 +244,7 @@ class Hooks {
 		if ( $params['itemType'] === 'file' ) {
 		
 			$view = new \OC_FilesystemView( '/' );
-			$session = new Session();
+			$session = new Session($view);
 			$userId = \OCP\User::getUser();
 			$util = new Util( $view, $userId );
 			$path = $util->fileIdToPath( $params['itemSource'] );
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index d5aa0f74f1..7e18ec9b10 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -101,7 +101,7 @@ class Proxy extends \OC_FileProxy {
 				$userId = \OCP\USER::getUser();
 				$rootView = new \OC_FilesystemView( '/' );
 				$util = new Util( $rootView, $userId );
-				$session = new Session();
+				$session = new Session($rootView);
 				$fileOwner = \OC\Files\Filesystem::getOwner( $path );
 				$privateKey = $session->getPrivateKey();
 				$filePath = $util->stripUserFilesPath( $path );
@@ -223,7 +223,7 @@ class Proxy extends \OC_FileProxy {
 		) {
 		
 			// TODO use get owner to find correct location of key files for shared files
-			$session = new Session();
+			$session = new Session($view);
 			$privateKey = $session->getPrivateKey( $userId );
 			
 			// Get the file owner so we can retrieve its keyfile
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 9d01c2ca6c..8bacb98126 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -236,7 +236,7 @@ class Stream {
 			
 			$this->getUser();
 			
-			$session = new Session();
+			$session = new Session($this->rootView);
 			
 			$privateKey = $session->getPrivateKey( $this->userId );