From: John Molakvoæ <skjnldsv@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:47:48 +0000 (+0200)
Subject: Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
X-Git-Tag: v30.0.0beta1~378^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F40122%2Fhead;p=nextcloud-server.git

Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
---

9197676b8210708e7cf0782d42156b47ccae186e
diff --cc lib/private/Encryption/EncryptionWrapper.php
index cc1c5326c5c,9f638ff5419..d3bf0aeb4d8
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@@ -11,7 -11,7 +11,8 @@@ use OC\Files\Filesystem
  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;
  use OCP\Files\Storage\IStorage;
@@@ -65,8 -65,8 +66,8 @@@ class EncryptionWrapper 
  			$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->getEncryptionKeyStorage();
+ 			$keyStorage = \OC::$server->get(EncryptionKeysStorage::class);
  
  			$util = new Util(
  				new View(),