aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2015-05-18 13:40:23 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2015-05-18 15:45:47 +0200
commit30d165ebf228f0803183bc772a988a4958356047 (patch)
tree632174ad4dffc1dd4a00f8870119bc1325ac6b45 /apps
parent4444db61b7accb7627c6c939e33e8af0439b167e (diff)
downloadnextcloud-server-30d165ebf228f0803183bc772a988a4958356047.tar.gz
nextcloud-server-30d165ebf228f0803183bc772a988a4958356047.zip
Add missing import for the exception
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/lib/crypto/encryption.php2
-rw-r--r--apps/encryption/tests/lib/crypto/encryptionTest.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 83ed1b59c8a..df3f9a0997e 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -25,6 +25,7 @@
namespace OCA\Encryption\Crypto;
+use OC\Encryption\Exceptions\DecryptionFailedException;
use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\Util;
use OCP\Encryption\IEncryptionModule;
@@ -274,6 +275,7 @@ class Encryption implements IEncryptionModule {
*
* @param string $data you want to decrypt
* @return mixed decrypted data
+ * @throws DecryptionFailedException
*/
public function decrypt($data) {
if (empty($this->fileKey)) {
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 509cd9dbc40..d33aff877bf 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -231,6 +231,7 @@ class EncryptionTest extends TestCase {
);
}
+ /**
* by default the encryption module should encrypt regular files, files in
* files_versions and files in files_trashbin
*