Skip to content

Refactor OC\Server::getEncryptionFilesHelper #40122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 3 commits into from
Jun 4, 2024
Merged

Refactor OC\Server::getEncryptionFilesHelper #40122

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be4e309
Refactor `OC\Server::getEncryptionFilesHelper`
summersab Aug 29, 2023
16e331f
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
skjnldsv May 30, 2024
9197676
Merge branch 'master' into refactor/OC-Server-getEncryptionFilesHelper
skjnldsv Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/private/Encryption/EncryptionWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OC\Files\Storage\Wrapper\Encryption;
use OC\Files\View;
use OC\Memcache\ArrayCache;
use OCP\Encryption\IFile;
use OCP\Files\Mount\IMountPoint;
use OCP\Files\Storage\IDisableEncryptionStorage;
use OCP\Files\Storage\IStorage;
Expand Down Expand Up @@ -64,7 +65,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->getEncryptionKeyStorage();

$util = new Util(
Expand Down
3 changes: 2 additions & 1 deletion lib/private/Encryption/HookManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
);
Expand Down