mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration to Circles 22 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2021-05-29 10:04:26 -01:00
parent 222ac93774
commit 11ad88e987
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/dav/lib/Connector/Sabre/Principal.php
View File

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