upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 15:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
This commit is contained in:
John Molakvoæ 2024-06-04 17:27:41 +02:00 committed by GitHub
commit 4e2ada0155
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/private/Encryption/EncryptionWrapper.php
View file

@ -11,6 +11,7 @@ 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;
@ -65,7 +66,7 @@ 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->get(EncryptionKeysStorage::class);
$util = new Util(

3
lib/private/Encryption/HookManager.php
View file

@ -10,6 +10,7 @@ namespace OC\Encryption;
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 @@ class HookManager {
\OC::$server->getConfig()),
Filesystem::getMountManager(),
\OC::$server->getEncryptionManager(),
\OC::$server->getEncryptionFilesHelper(),
\OC::$server->get(IFile::class),
\OC::$server->get(LoggerInterface::class),
$uid
);