diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-06-04 15:47:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 15:47:48 +0200 |
| commit | 9197676b8210708e7cf0782d42156b47ccae186e (patch) | |
| tree | 0c034529aa903d116261f909e5b26bf19db0d50e /lib/private/Encryption/EncryptionWrapper.php | |
| parent | 16e331ffb94b016895b0de21159b78061b3899e2 (diff) | |
| parent | 57cd95f804cd2e8fe6e955dc032b1fbc73024a19 (diff) | |
| download | nextcloud-server-9197676b8210708e7cf0782d42156b47ccae186e.tar.gz nextcloud-server-9197676b8210708e7cf0782d42156b47ccae186e.zip | |
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
Diffstat (limited to 'lib/private/Encryption/EncryptionWrapper.php')
| -rw-r--r-- | lib/private/Encryption/EncryptionWrapper.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php index cc1c5326c5c..d3bf0aeb4d8 100644 --- a/lib/private/Encryption/EncryptionWrapper.php +++ b/lib/private/Encryption/EncryptionWrapper.php @@ -12,6 +12,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; use OCP\Files\Storage\IStorage; @@ -66,7 +67,7 @@ class EncryptionWrapper { $mountManager = Filesystem::getMountManager(); $uid = $user ? $user->getUID() : null; $fileHelper = \OC::$server->get(IFile::class); - $keyStorage = \OC::$server->getEncryptionKeyStorage(); + $keyStorage = \OC::$server->get(EncryptionKeysStorage::class); $util = new Util( new View(), |