From f11f524dfa17071dbabb2f950680966867f262a6 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 15 Aug 2012 18:49:53 +0100
Subject: working on streaming decrypted content applied some dependency
 injection to keymanager.php

---
 apps/files_encryption/hooks/hooks.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'apps/files_encryption/hooks')

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e23e3a09d46..b37c974b9c1 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -39,6 +39,8 @@ class Hooks {
 
 		if ( Crypt::mode( $params['uid'] ) == 'server' ) {
 
+			# TODO: use lots of dependency injection here
+		
 			$view = new \OC_FilesystemView( '/' );
 
 			$util = new Util( $view, $params['uid'] );
@@ -49,8 +51,12 @@ class Hooks {
 
 			}
 		
-			$encryptedKey = Keymanager::getPrivateKey( $params['uid'] );
+			\OC_FileProxy::$enabled = false;
+		
+			$encryptedKey = Keymanager::getPrivateKey( $params['uid'], $view );
 
+			\OC_FileProxy::$enabled = true;
+			
 			$_SESSION['enckey'] = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
 			
 		}
-- 
cgit v1.2.3