From 9a4d37f626dca4663ea7d25f78f7c1f174306ab5 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 16 Sep 2015 16:58:26 +0100
Subject: Display storage status as tooltip

---
 apps/files_external/lib/config.php        |  1 +
 apps/files_external/lib/storageconfig.php | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'apps/files_external/lib')

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index d9fdb748fcd..56a7e547ec6 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -269,6 +269,7 @@ class OC_Mount_Config {
 				}
 			} catch (Exception $exception) {
 				\OCP\Util::logException('files_external', $exception);
+				throw $e;
 			}
 		}
 		return self::STATUS_ERROR;
diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/storageconfig.php
index 70aaa186783..86a7e6ffa12 100644
--- a/apps/files_external/lib/storageconfig.php
+++ b/apps/files_external/lib/storageconfig.php
@@ -72,6 +72,13 @@ class StorageConfig implements \JsonSerializable {
 	 */
 	private $status;
 
+	/**
+	 * Status message
+	 *
+	 * @var string
+	 */
+	private $statusMessage;
+
 	/**
 	 * Priority
 	 *
@@ -295,7 +302,7 @@ class StorageConfig implements \JsonSerializable {
 	}
 
 	/**
-	 * Sets the storage status, whether the config worked last time
+	 * Gets the storage status, whether the config worked last time
 	 *
 	 * @return int $status status
 	 */
@@ -303,13 +310,24 @@ class StorageConfig implements \JsonSerializable {
 		return $this->status;
 	}
 
+	/**
+	 * Gets the message describing the storage status
+	 *
+	 * @return string|null
+	 */
+	public function getStatusMessage() {
+		return $this->statusMessage;
+	}
+
 	/**
 	 * Sets the storage status, whether the config worked last time
 	 *
 	 * @param int $status status
+	 * @param string|null $message optional message
 	 */
-	public function setStatus($status) {
+	public function setStatus($status, $message = null) {
 		$this->status = $status;
+		$this->statusMessage = $message;
 	}
 
 	/**
@@ -341,6 +359,9 @@ class StorageConfig implements \JsonSerializable {
 		if (!is_null($this->status)) {
 			$result['status'] = $this->status;
 		}
+		if (!is_null($this->statusMessage)) {
+			$result['statusMessage'] = $this->statusMessage;
+		}
 		return $result;
 	}
 }
-- 
cgit v1.2.3