if the exception contain a hint what went wrong we display it to the user

2 files changed, 26 insertions, 3 deletions

diff --git a/controller/filehandlingcontroller.php b/controller/filehandlingcontroller.php
index 3036431..646e386 100644
--- a/controller/filehandlingcontroller.php
+++ b/controller/filehandlingcontroller.php
@@ -109,7 +109,12 @@ class FileHandlingController extends Controller{
 			}
 
 		} catch (\Exception $e) {
-			return new DataResponse(['message' => 'An internal server error occurred.'], Http::STATUS_BAD_REQUEST);
+			if(method_exists($e, 'getHint')) {
+				$message = (string)$e->getHint();
+			} else {
+				$message = (string)$this->l->t('An internal server error occurred.');
+			}
+			return new DataResponse(['message' => $message], Http::STATUS_BAD_REQUEST);
 		}
 	}
 
diff --git a/tests/controller/filehandlingcontrollertest.php b/tests/controller/filehandlingcontrollertest.php
index 3e78c1d..70d7fee 100644
--- a/tests/controller/filehandlingcontrollertest.php
+++ b/tests/controller/filehandlingcontrollertest.php
@@ -116,14 +116,14 @@ class FileHandlingControllerTest extends TestCase {
 		);
 	}
 
-	public function testLoadException() {
+	public function testLoadExceptionWithNoHint() {
 
 		$exceptionHint = 'test exception';
 
 		$this->viewMock->expects($this->any())
 			->method('file_get_contents')
 			->willReturnCallback(function() use ($exceptionHint) {
-				throw new HintException('error message', $exceptionHint);
+				throw new \Exception();
 			});
 
 		$result = $this->controller->load('/', 'test.txt');
@@ -134,6 +134,24 @@ class FileHandlingControllerTest extends TestCase {
 		$this->assertSame('An internal server error occurred.', $data['message']);
 	}
 
+	public function testLoadExceptionWithHint() {
+
+		$exceptionHint = 'test exception';
+
+		$this->viewMock->expects($this->any())
+			->method('file_get_contents')
+			->willReturnCallback(function() use ($exceptionHint) {
+				throw new HintException('error message', $exceptionHint);
+			});
+
+		$result = $this->controller->load('/', 'test.txt');
+		$data = $result->getData();
+
+		$this->assertSame(400, $result->getStatus());
+		$this->assertArrayHasKey('message', $data);
+		$this->assertSame($exceptionHint, $data['message']);
+	}
+
 	/**
 	 * @dataProvider dataTestSave
 	 *