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

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

diff --cc lib/private/Encryption/EncryptionWrapper.php
index cc1c5326c5ce720cdfc3e1b4bc947e04e551bf43,9f638ff5419a8826ee876d9b01b118b6d4fcc1a5..d3bf0aeb4d83a4df0e569086d77e9189b2456c44
--- 1/lib/private/Encryption/EncryptionWrapper.php
--- 2/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(),