2 files changed, 13 insertions, 41 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e3196480457..53afefc721b 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -225,15 +225,20 @@ class Hooks {
 				break;
 		}
 
+		$error = false;
 		foreach ($users as $user) {
 			if (!$view->file_exists($user . '.public.key')) {
-				// Set flag var 'run' to notify emitting
-				// script that hook execution failed
-				$params['run']->run = false;
-				// TODO: Make sure files_sharing provides user
-				// feedback on failed share
+				$error = true;
+				break;
 			}
 		}
+
+		if($error)
+			// Set flag var 'run' to notify emitting
+			// script that hook execution failed
+			$params['run']->run = false;
+			// TODO: Make sure files_sharing provides user
+			// feedback on failed share
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 6a1f1aef659..049f3fb5d98 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -706,41 +706,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 		$this->assertEquals($this->dataLong, $decrypt);
 
-		$newFolder = '/newfolder' . time();
-
-		$view->rename($folder, $newFolder);
-
-		// Get file decrypted contents
-		$newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
-
-		$this->assertEquals($this->dataLong, $newDecrypt);
-
-		// tear down
-		$view->unlink($newFolder);
-	}
-
-	function testRenameFolder()
-	{
-
-		$filename = '/tmp-' . time();
+		$newFolder = '/newfolder/subfolder' . time();
+		$view->mkdir('/newfolder');
 
-		$folder = '/folder';
-		$newFolder = '/newfolder';
-		$view = new \OC\Files\View('/' . $this->userId . '/files');
-		$view->mkdir($folder);
-
-		// Save long data as encrypted file using stream wrapper
-		$cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
-
-		// Test that data was successfully written
-		$this->assertTrue(is_int($cryptedFile));
-
-		// Get file decrypted contents
-		$decrypt = file_get_contents('crypt://' . $folder . $filename);
-
-		$this->assertEquals($this->dataLong, $decrypt);
-
-		// rename folder
 		$view->rename($folder, $newFolder);
 
 		// Get file decrypted contents
@@ -754,8 +722,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
 	function testChangePassphrase()
 	{
-
-		$filename = 'tmp-' . time();
+	$filename = 'tmp-' . time();
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);