From 5f75468aa4341672e3a805ab5ce2ae03ba7402cc Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Tue, 30 May 2017 13:22:27 +0200
Subject: improve status messages

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 apps/encryption/lib/Controller/StatusController.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'apps/encryption/lib/Controller')

diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 0776a84ceb4..9ec9fd1234b 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -28,6 +28,7 @@ namespace OCA\Encryption\Controller;
 use OCA\Encryption\Session;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\Encryption\IManager;
 use OCP\IL10N;
 use OCP\IRequest;
 
@@ -39,20 +40,26 @@ class StatusController extends Controller {
 	/** @var Session */
 	private $session;
 
+	/** @var IManager */
+	private $encryptionManager;
+
 	/**
 	 * @param string $AppName
 	 * @param IRequest $request
 	 * @param IL10N $l10n
 	 * @param Session $session
+	 * @param IManager $encryptionManager
 	 */
 	public function __construct($AppName,
 								IRequest $request,
 								IL10N $l10n,
-								Session $session
+								Session $session,
+								IManager $encryptionManager
 								) {
 		parent::__construct($AppName, $request);
 		$this->l = $l10n;
 		$this->session = $session;
+		$this->encryptionManager = $encryptionManager;
 	}
 
 	/**
@@ -78,9 +85,15 @@ class StatusController extends Controller {
 				break;
 			case Session::NOT_INITIALIZED:
 				$status = 'interactionNeeded';
-				$message = (string)$this->l->t(
-					'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
-				);
+				if ($this->encryptionManager->isEnabled()) {
+					$message = (string)$this->l->t(
+						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
+					);
+				} else {
+					$message = (string)$this->l->t(
+						'Please enable server side encryption in the admin settings in order to use the encryption module.'
+					);
+				}
 				break;
 			case Session::INIT_SUCCESSFUL:
 				$status = 'success';
-- 
cgit v1.2.3