From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 13 Jan 2016 10:55:50 +0000 (+0100)
Subject: Fix test for ensureSystemAddressBookExists
X-Git-Tag: v9.0beta1~249^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac55bac4610cc03445d50e845bdf205ed7288b78;p=nextcloud-server.git

Fix test for ensureSystemAddressBookExists
---

diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index 762946a4fd2..7b8c43958b6 100644
--- a/apps/dav/lib/carddav/carddavbackend.php
+++ b/apps/dav/lib/carddav/carddavbackend.php
@@ -26,7 +26,6 @@ namespace OCA\DAV\CardDAV;
 
 use OCA\DAV\Connector\Sabre\Principal;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use Sabre\CardDAV\Backend\BackendInterface;
 use Sabre\CardDAV\Backend\SyncSupport;
 use Sabre\CardDAV\Plugin;
@@ -69,7 +68,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	}
 
 	/**
-	 * Returns the list of addressbooks for a specific user.
+	 * Returns the list of address books for a specific user.
 	 *
 	 * Every addressbook should have the following properties:
 	 *   id - an arbitrary unique id
@@ -821,7 +820,6 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 		}
 
 		$newUri = sha1($addressBook->getName() . $addressBook->getOwner());
-//		$newUri = $addressBook->getName() . '-' . $addressBook->getOwner();
 		$query = $this->db->getQueryBuilder();
 		$query->insert('dav_shares')
 			->values([
@@ -982,6 +980,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 	}
 
 	/**
+	 * For shared address books the sharee is set in the ACL of the address book
 	 * @param $addressBookId
 	 * @param $acl
 	 * @return array
diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/carddav/syncservice.php
index 97a46d62501..d66d316f6f7 100644
--- a/apps/dav/lib/carddav/syncservice.php
+++ b/apps/dav/lib/carddav/syncservice.php
@@ -90,13 +90,13 @@ class SyncService {
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 */
 	public function ensureSystemAddressBookExists($principal, $id, $properties) {
-		$book = $this->backend->getAddressBooksByUri($id);
+		$book = $this->backend->getAddressBooksByUri($principal, $id);
 		if (!is_null($book)) {
 			return $book;
 		}
 		$this->backend->createAddressBook($principal, $id, $properties);
 
-		return $this->backend->getAddressBooksByUri($id);
+		return $this->backend->getAddressBooksByUri($principal, $id);
 	}
 
 	/**