Fix test for ensureSystemAddressBookExists

diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index 762946a4fd28e5f20f60a6ce59d3afa828fdd699..7b8c43958b6b65e0d7b632fe36b2215f598bb1ea 100644 (file)
--- 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 97a46d62501c532c4fa941cf5d04afc34432c08c..d66d316f6f7b83281ba1da21048de798ebf3e778 100644 (file)
--- 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);
        }
 
        /**