From b0a6d3b0ef16bc2baf935c05f2d28e4cce5f695b Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Wed, 16 Aug 2023 00:16:28 +0530
Subject: [PATCH] fix addressbookid

---
 plugins/nextcloud/NextcloudAddressBook.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/nextcloud/NextcloudAddressBook.php b/plugins/nextcloud/NextcloudAddressBook.php
index e4ce6711c..64b969e94 100644
--- a/plugins/nextcloud/NextcloudAddressBook.php
+++ b/plugins/nextcloud/NextcloudAddressBook.php
@@ -15,12 +15,14 @@ class NextcloudAddressBook implements \RainLoop\Providers\AddressBook\AddressBoo
 		$uid = \OC::$server->getUserSession()->getUser()->getUID();
 		$cardDavBackend = \OC::$server->get(\OCA\DAV\CardDAV\CardDavBackend::class);
 		$principalUri = 'principals/users/'. $uid;
-		$addressBookId = $cardDavBackend->getAddressBooksByUri($principalUri, self::URI)->id;
-		if (empty($addressBookId)) {
+		$addressBookId = $cardDavBackend->getAddressBooksByUri($principalUri, self::URI);
+		if ($addressBookId === null) {
 			$addressBookId = $cardDavBackend->createAddressBook($principalUri, self::URI, array_filter([
                 '{DAV:}displayname' => 'Webmail',
                 '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'Recipients from snappymail',
             ]));
+		} else {
+			$addressBookId = $addressBookId['id'];
 		}
 		$this->key = $addressBookId;
 	}