From dc26d94014b1d4e3d99c1789ee423b5d0cae12bf Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sun, 3 Mar 2019 23:07:07 +0100 Subject: [PATCH] properly catch exceptions of detailsCircle Signed-off-by: Georg Ehrke --- apps/dav/lib/Connector/Sabre/Principal.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php index a0051980fc1..af55b8bedb9 100644 --- a/apps/dav/lib/Connector/Sabre/Principal.php +++ b/apps/dav/lib/Connector/Sabre/Principal.php @@ -34,6 +34,8 @@ namespace OCA\DAV\Connector\Sabre; +use OCA\Circles\Exceptions\CircleDoesNotExistException; +use OCP\AppFramework\QueryException; use OCP\IConfig; use OCP\IGroup; use OCP\IGroupManager; @@ -404,7 +406,13 @@ class Principal implements BackendInterface { return null; } - $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId); + try { + $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true); + } catch(QueryException $ex) { + return null; + } catch(CircleDoesNotExistException $ex) { + return null; + } if (!$circle) { return null;