allow sharing addressbooks with circles

Signed-off-by: Georg Ehrke <[email protected]>
coletivoEITA · Mar 1, 2019 · 34601f8 · 34601f8
1 parent 5e37b52
commit 34601f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -167,8 +167,10 @@ function getAddressBooksForUser($principalUri) {
 		}
 		$result->closeCursor();
 
-		// query for shared calendars
+		// query for shared addressbooks
 		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+		$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
 		$principals = array_map(function($principal) {
 			return urldecode($principal);
 		}, $principals);

diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -426,13 +426,12 @@ protected function circleToPrincipal($circleUniqueId) {
 	 * @return array
 	 * @throws Exception
 	 */
-	public function getCircleMembership($principal) {
+	public function getCircleMembership($principal):array {
 		if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
 			return [];
 		}
 
 		list($prefix, $name) = \Sabre\Uri\split($principal);
-
 		if ($this->hasCircles && $prefix === $this->principalPrefix) {
 			$user = $this->userManager->get($name);
 			if (!$user) {