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

Merge pull request #27275 from nextcloud/bugfix/noid/circles-22-in-dav 

Fixing invalid classes and methods for circles 22
This commit is contained in:
Joas Schilling 2021-05-31 13:03:07 +02:00 committed by GitHub
parent fd63132f47 11ad88e987
commit 773e28d8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
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;