cleanup keymanager test and add some additional tests

2 files changed, 7 insertions, 4 deletions

diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index e8e92cd549a..f96c426a725 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -300,6 +300,7 @@ class KeyManager {
 	 *
 	 * @param string $uid userid
 	 * @param string $passPhrase users password
+	 * @return boolean
 	 */
 	public function init($uid, $passPhrase) {
 		try {
@@ -314,6 +315,8 @@ class KeyManager {
 
 		$this->session->setPrivateKey($privateKey);
 		$this->session->setStatus(Session::INIT_SUCCESSFUL);
+
+		return true;
 	}
 
 	/**
@@ -353,14 +356,14 @@ class KeyManager {
 	}
 
 	/**
-	 * delete file key
+	 * delete share key
 	 *
 	 * @param string $path
 	 * @param string $keyId
 	 * @return boolean
 	 */
-	public function deleteFileKey($path, $keyId) {
-		return $this->keyStorage->deleteFileKey($path, $keyId);
+	public function deleteShareKey($path, $keyId) {
+		return $this->keyStorage->deleteFileKey($path, $keyId . '.' . $this->shareKeyId);
 	}
 
 
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index 00711e3bfab..4201b829ec9 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -228,7 +228,7 @@ class Recovery {
 			if ($item['type'] === 'dir') {
 				$this->removeRecoveryKeys($filePath . '/');
 			} else {
-				$this->keyManager->deleteFileKey($filePath, $this->keyManager->getRecoveryKeyId() . '.shareKey');
+				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
 			}
 		}
 	}