Fixed incompatibilities with filecache rewrite merge

2 files changed, 7 insertions, 7 deletions

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 9d4f5a1fae0..106b757307d 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -170,10 +170,10 @@ class Crypt {
 	 */

 	public static function isEncryptedMeta( $path ) {

 	

-		// TODO: Use DI to get OC_FileCache_Cached out of here

+		// TODO: Use DI to get \OC\Files\Filesystem out of here

 	

 		// Fetch all file metadata from DB

-		$metadata = \OC_FileCache_Cached::get( $path, '' );

+		$metadata = \OC\Files\Filesystem::getFileInfo( $path, '' );

 		

 		// Return encryption status

 		return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];

@@ -187,7 +187,7 @@ class Crypt {
 	public static function isLegacyEncryptedContent( $content ) {

 	

 		// Fetch all file metadata from DB

-		$metadata = \OC_FileCache_Cached::get( $content, '' );

+		$metadata = \OC\Files\Filesystem::getFileInfo( $content, '' );

 	

 		// If a file is flagged with encryption in DB, but isn't a 

 		// valid content + IV combination, it's probably using the 

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f7245d11cf5..55cddf2bec8 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -129,7 +129,7 @@ class Proxy extends \OC_FileProxy {
 				Keymanager::setFileKey( $view, $filePath, $userId, $encrypted['key'] );
 				
 				// Update the file cache with file info
-				\OC_FileCache::put( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
+				\OC\Files\Filesystem::putFileInfo( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
 				
 				// Re-enable proxy - our work is done
 				\OC_FileProxy::$enabled = true;
@@ -162,7 +162,7 @@ class Proxy extends \OC_FileProxy {
 			
 			$filePath = '/' . implode( '/', $filePath );
 			
-			//$cached = \OC_FileCache_Cached::get( $path, '' );
+			//$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
 			
 			$view = new \OC_FilesystemView( '' );
 			
@@ -363,7 +363,7 @@ class Proxy extends \OC_FileProxy {
 	
 		if ( Crypt::isCatfile( $path ) ) {
 		
-			$cached = \OC_FileCache_Cached::get( $path, '' );
+			$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
 			
 			$data['size'] = $cached['size'];
 			
@@ -376,7 +376,7 @@ class Proxy extends \OC_FileProxy {
 		
 		if ( Crypt::isCatfile( $path ) ) {
 			
-			$cached = \OC_FileCache_Cached::get( $path, '' );
+			$cached = \OC\Files\Filesystem::getFileInfo( $path, '' );
 			
 			return  $cached['size'];