Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all

close encryption session after decryption was finished

apps/files_encryption/lib/session.php

@@ -134,6 +134,14 @@ class Session {
 
 	}
 
+	/**
+	 * @brief remove encryption keys and init status from session
+	 */
+	public function closeSession() {
+		\OC::$session->remove('encryptionInitialized');
+		\OC::$session->remove('privateKey');
+	}
+
 
 	/**
 	 * @brief Gets status if we already tried to initialize the encryption app

apps/files_encryption/lib/util.php

@@ -1772,4 +1772,12 @@ class Util {
 		return $session;
 	}
 
+	/*
+	 * @brief remove encryption related keys from the session
+	 */
+	public function closeEncryptionSession() {
+		$session = new \OCA\Encryption\Session($this->view);
+		$session->closeSession();
+	}
+
 }

settings/ajax/decryptall.php

@@ -24,6 +24,8 @@ if ($result !== false) {
 		$successful = false;
 	}
 
+	$util->closeEncryptionSession();
+
 	if ($successful === true) {
 		\OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
 	} else {