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 887ca988b1addfac037b50c59ae07b16b98635c8,4ff8a3c0c6dfc1712e9fe7eb70159b8f57d0d7d5..cc1c5326c5ce720cdfc3e1b4bc947e04e551bf43
--- 1/lib/private/Encryption/EncryptionWrapper.php
--- 2/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@@ -28,9 -11,9 +11,10 @@@ use OC\Files\Filesystem
  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;
+ use OCP\Files\Storage\IDisableEncryptionStorage;
+ use OCP\Files\Storage\IStorage;
  use Psr\Log\LoggerInterface;
  
  /**

diff --cc lib/private/Encryption/HookManager.php
index 0e8704ad03f219429c5557f9bf093137d2357cc3,fc6546fb253a0e57a86ec47eaa2696e12ae3e573..5ce51229e4ef111e3156bc2fc4cdf1903dfb2088
--- 1/lib/private/Encryption/HookManager.php
--- 2/lib/private/Encryption/HookManager.php
+++ b/lib/private/Encryption/HookManager.php
@@@ -24,9 -8,8 +8,9 @@@
  namespace OC\Encryption;
  
  use OC\Files\Filesystem;
- use OC\Files\View;
  use OC\Files\SetupManager;
+ use OC\Files\View;
 +use OCP\Encryption\IFile;
  use Psr\Log\LoggerInterface;
  
  class HookManager {