Merge pull request #40122 from summersab/refactor/OC-Server-getEncryp…

…tionFilesHelper
nextcloud · Jun 4, 2024 · 4e2ada0 · 4e2ada0
2 parents 3f77eb0 + 9197676
commit 4e2ada0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
@@ -11,6 +11,7 @@
 use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\View;
 use OC\Memcache\ArrayCache;
+use OCP\Encryption\IFile;
 use OCP\Encryption\Keys\IStorage as EncryptionKeysStorage;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\Storage\IDisableEncryptionStorage;
@@ -65,7 +66,7 @@ public function wrapStorage(string $mountPoint, IStorage $storage, IMountPoint $
 			$user = \OC::$server->getUserSession()->getUser();
 			$mountManager = Filesystem::getMountManager();
 			$uid = $user ? $user->getUID() : null;
-			$fileHelper = \OC::$server->getEncryptionFilesHelper();
+			$fileHelper = \OC::$server->get(IFile::class);
 			$keyStorage = \OC::$server->get(EncryptionKeysStorage::class);
 
 			$util = new Util(

diff --git a/lib/private/Encryption/HookManager.php b/lib/private/Encryption/HookManager.php
@@ -10,6 +10,7 @@
 use OC\Files\Filesystem;
 use OC\Files\SetupManager;
 use OC\Files\View;
+use OCP\Encryption\IFile;
 use Psr\Log\LoggerInterface;
 
 class HookManager {
@@ -63,7 +64,7 @@ private static function getUpdate(?string $owner = null): Update {
 					\OC::$server->getConfig()),
 				Filesystem::getMountManager(),
 				\OC::$server->getEncryptionManager(),
-				\OC::$server->getEncryptionFilesHelper(),
+				\OC::$server->get(IFile::class),
 				\OC::$server->get(LoggerInterface::class),
 				$uid
 			);