From 64c1c5becc8d08b662b334909ff3bdd24687b338 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 18 May 2018 14:55:27 +0200
Subject: [PATCH] set border color for account deletion request and rename
 heading

also, fix caught Exception type and message (missed to push earlier)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 css/style.css                            | 3 ---
 css/style.scss                           | 7 +++++++
 lib/Controller/DataRequestController.php | 8 ++++----
 templates/Settings/personal.php          | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 css/style.css
 create mode 100644 css/style.scss

diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index b0fc1ab..0000000
--- a/css/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#data-request * button {
-	min-width: 225px;
-}
diff --git a/css/style.scss b/css/style.scss
new file mode 100644
index 0000000..38913f1
--- /dev/null
+++ b/css/style.scss
@@ -0,0 +1,7 @@
+#data-request * button {
+	min-width: 225px;
+}
+
+#data-request-deletion {
+	border-color: $color-error;
+}
diff --git a/lib/Controller/DataRequestController.php b/lib/Controller/DataRequestController.php
index 3e7bc7d..60b15de 100644
--- a/lib/Controller/DataRequestController.php
+++ b/lib/Controller/DataRequestController.php
@@ -23,7 +23,7 @@
 
 namespace OCA\DataRequest\Controller;
 
-use OC\HintException;
+use OCA\DataRequest\Exceptions\HintedRuntime;
 use OCA\DataRequest\Services\Request;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -55,9 +55,9 @@ class DataRequestController extends OCSController {
 		try {
 			$this->dataRequest->sendExportRequest();
 			return new DataResponse();
-		} catch(\RuntimeException $e) {
+		} catch(HintedRuntime $e) {
 			return new DataResponse(
-				['error' => $e->getMessage()],
+				['error' => $e->getHint()],
 				Http::STATUS_INTERNAL_SERVER_ERROR
 			);
 		}
@@ -71,7 +71,7 @@ class DataRequestController extends OCSController {
 		try {
 			$this->dataRequest->sendDeleteRequest();
 			return new DataResponse();
-		} catch(HintException $e) {
+		} catch(HintedRuntime $e) {
 			return new DataResponse(
 				['error' => $e->getHint()],
 				Http::STATUS_INTERNAL_SERVER_ERROR
diff --git a/templates/Settings/personal.php b/templates/Settings/personal.php
index dc53520..ed17d04 100644
--- a/templates/Settings/personal.php
+++ b/templates/Settings/personal.php
@@ -28,11 +28,11 @@ script('data_request', ['init', 'app']);
 ?>
 
 <div id="data-request" class="section">
-	<h2><?php p($l->t('Personal data requests')); ?></h2>
+	<h2><?php p($l->t('Account')); ?></h2>
 	<div>
-		<button id="data-request-export" data-request="export" class="button"><?php p($l->t('Request data export')); ?></button>
+		<button id="data-request-export" data-request="export" class="button"><?php p($l->t('Request data export')); ?></button><span class="warning hidden"></span>
 	</div>
 	<div>
-		<button id="data-request-deletion" data-request="deletion" class="button"><?php p($l->t('Request account deletion')); ?></button>
+		<button id="data-request-deletion" data-request="deletion" class="button"><?php p($l->t('Request account deletion')); ?></button><span class="warning hidden"></span>
 	</div>
 </div>