From 11ad88e987c79bc36fa11002f94adb66fd9112de Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 29 May 2021 10:04:26 -0100
Subject: [PATCH] migration to Circles 22

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 apps/dav/lib/Connector/Sabre/Principal.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
index b74747b116..1ebe853e46 100644
--- a/apps/dav/lib/Connector/Sabre/Principal.php
+++ b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -37,7 +37,7 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\KnownUser\KnownUserService;
-use OCA\Circles\Exceptions\CircleDoesNotExistException;
+use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\DAV\CalDAV\Proxy\ProxyMapper;
 use OCA\DAV\Traits\PrincipalProxyTrait;
 use OCP\App\IAppManager;
@@ -534,7 +534,7 @@ class Principal implements BackendInterface {
 			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($circleUniqueId, true);
 		} catch (QueryException $ex) {
 			return null;
-		} catch (CircleDoesNotExistException $ex) {
+		} catch (CircleNotFoundException $ex) {
 			return null;
 		}
 
@@ -544,7 +544,7 @@ class Principal implements BackendInterface {
 
 		$principal = [
 			'uri' => 'principals/circles/' . $circleUniqueId,
-			'{DAV:}displayname' => $circle->getName(),
+			'{DAV:}displayname' => $circle->getDisplayName(),
 		];
 
 		return $principal;
@@ -575,7 +575,7 @@ class Principal implements BackendInterface {
 
 			$circles = array_map(function ($circle) {
 				/** @var \OCA\Circles\Model\Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getUniqueId());
+				return 'principals/circles/' . urlencode($circle->getSingleId());
 			}, $circles);
 
 			return $circles;