1 files changed, 18 insertions, 17 deletions

diff --git a/apps/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php
index 6126ebc10ee..b35137c902d 100644
--- a/apps/dav/lib/CardDAV/ContactsManager.php
+++ b/apps/dav/lib/CardDAV/ContactsManager.php
@@ -7,26 +7,23 @@
  */
 namespace OCA\DAV\CardDAV;
 
+use OCA\DAV\Db\PropertyMapper;
 use OCP\Contacts\IManager;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 
 class ContactsManager {
-	/** @var CardDavBackend  */
-	private $backend;
-
-	/** @var IL10N  */
-	private $l10n;
-
 	/**
 	 * ContactsManager constructor.
 	 *
 	 * @param CardDavBackend $backend
 	 * @param IL10N $l10n
 	 */
-	public function __construct(CardDavBackend $backend, IL10N $l10n) {
-		$this->backend = $backend;
-		$this->l10n = $l10n;
+	public function __construct(
+		private CardDavBackend $backend,
+		private IL10N $l10n,
+		private PropertyMapper $propertyMapper,
+	) {
 	}
 
 	/**
@@ -36,33 +33,37 @@ class ContactsManager {
 	 */
 	public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) {
 		$addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId");
-		$this->register($cm, $addressBooks, $urlGenerator);
-		$this->setupSystemContactsProvider($cm, $urlGenerator);
+		$this->register($cm, $addressBooks, $urlGenerator, $userId);
+		$this->setupSystemContactsProvider($cm, $userId, $urlGenerator);
 	}
 
 	/**
 	 * @param IManager $cm
+	 * @param ?string $userId
 	 * @param IURLGenerator $urlGenerator
 	 */
-	public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) {
-		$addressBooks = $this->backend->getAddressBooksForUser("principals/system/system");
-		$this->register($cm, $addressBooks, $urlGenerator);
+	public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) {
+		$addressBooks = $this->backend->getAddressBooksForUser('principals/system/system');
+		$this->register($cm, $addressBooks, $urlGenerator, $userId);
 	}
 
 	/**
 	 * @param IManager $cm
 	 * @param $addressBooks
 	 * @param IURLGenerator $urlGenerator
+	 * @param ?string $userId
 	 */
-	private function register(IManager $cm, $addressBooks, $urlGenerator) {
+	private function register(IManager $cm, $addressBooks, $urlGenerator, ?string $userId) {
 		foreach ($addressBooks as $addressBookInfo) {
-			$addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n);
+			$addressBook = new AddressBook($this->backend, $addressBookInfo, $this->l10n);
 			$cm->registerAddressBook(
 				new AddressBookImpl(
 					$addressBook,
 					$addressBookInfo,
 					$this->backend,
-					$urlGenerator
+					$urlGenerator,
+					$this->propertyMapper,
+					$userId,
 				)
 			);
 		}