3 files changed, 18 insertions, 3 deletions
diff --git a/apps/encryption/lib/Crypto/Encryption.php b/apps/encryption/lib/Crypto/Encryption.php
index c71e25b6442..fdcbd41a09c 100644
--- a/apps/encryption/lib/Crypto/Encryption.php
+++ b/apps/encryption/lib/Crypto/Encryption.php
@@ -177,6 +177,14 @@ class Encryption implements IEncryptionModule {
 		$this->isWriteOperation = false;
 		$this->writeCache = '';
 
+		if($this->session->isReady() === false) {
+			// if the master key is enabled we can initialize encryption
+			// with a empty password and user name
+			if ($this->util->isMasterKeyEnabled()) {
+				$this->keyManager->init('', '');
+			}
+		}
+
 		if ($this->session->decryptAllModeActivated()) {
 			$encryptedFileKey = $this->keyManager->getEncryptedFileKey($this->path);
 			$shareKey = $this->keyManager->getShareKey($this->path, $this->session->getDecryptAllUid());
diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php
index 96264d01363..26f023ed8f9 100644
--- a/apps/encryption/lib/KeyManager.php
+++ b/apps/encryption/lib/KeyManager.php
@@ -406,9 +406,6 @@ class KeyManager {
 		}
 
 		if ($this->util->isMasterKeyEnabled()) {
-			if ($this->session->getStatus() === Session::NOT_INITIALIZED)
-                        	$this->init('', '');
-			
 			$uid = $this->getMasterKeyId();
 		}
 
diff --git a/apps/encryption/lib/Session.php b/apps/encryption/lib/Session.php
index 92132d6080c..a61ee25fadb 100644
--- a/apps/encryption/lib/Session.php
+++ b/apps/encryption/lib/Session.php
@@ -68,6 +68,16 @@ class Session {
 	}
 
 	/**
+	 * check if encryption was initialized successfully
+	 *
+	 * @return bool
+	 */
+	public function isReady() {
+		$status = $this->getStatus();
+		return $status === self::INIT_SUCCESSFUL;
+	}
+
+	/**
 	 * Gets user or public share private key from session
 	 *
 	 * @return string $privateKey The user's plaintext private key