summaryrefslogtreecommitdiffstats
path: root/lib/private/encryption/keys
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-30 22:36:48 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:28 +0200
commitdbdd754c3fc37dc3100a9741f956d913e6d64576 (patch)
tree9aa55408b331d219a72cd53e2947ef8f06db85ce /lib/private/encryption/keys
parent00338f9dca97fd7b48d96201fd607cf460c385ff (diff)
downloadnextcloud-server-dbdd754c3fc37dc3100a9741f956d913e6d64576.tar.gz
nextcloud-server-dbdd754c3fc37dc3100a9741f956d913e6d64576.zip
Further cleanup of files_encryption
Diffstat (limited to 'lib/private/encryption/keys')
-rw-r--r--lib/private/encryption/keys/storage.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index 041db2a2cb8..82753df1dc7 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -23,9 +23,9 @@
namespace OC\Encryption\Keys;
+use OC\Encryption\Exceptions\GenericEncryptionException;
use OC\Encryption\Util;
use OC\Files\View;
-use OCA\Files_Encryption\Exception\EncryptionException;
class Storage implements \OCP\Encryption\Keys\IStorage {
@@ -253,13 +253,13 @@ class Storage implements \OCP\Encryption\Keys\IStorage {
*
* @param string $path path to the file, relative to data/
* @return string
- * @throws EncryptionException
+ * @throws GenericEncryptionException
* @internal param string $keyId
*/
private function getFileKeyDir($path) {
if ($this->view->is_dir($path)) {
- throw new EncryptionException('file was expected but directory was given', EncryptionException::GENERIC);
+ throw new GenericEncryptionException('file was expected but directory was given');
}
list($owner, $filename) = $this->util->getUidAndFilename($path);