fixup! feat: contacts import ocs

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -576,7 +576,7 @@ public function getCardByUid(int $addressBookId, string $uid): ?array {
 
 		return $row;
 	}
-
+	
 	/**
 	 * Returns a list of cards.
 	 *
@@ -624,30 +624,6 @@ public function getMultipleCards($addressBookId, array $uris) {
 		return $cards;
 	}
 
-	public function getCardByUID(int $addressBookId, string $uid) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from($this->dbCardsTable)
-			->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-			->andWhere($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->setMaxResults(1);
-
-		$result = $query->executeQuery();
-		$row = $result->fetchAssociative();
-		if (!$row) {
-			return false;
-		}
-		$row['etag'] = '"' . $row['etag'] . '"';
-
-		$modified = false;
-		$row['carddata'] = $this->readBlob($row['carddata'], $modified);
-		if ($modified) {
-			$row['size'] = strlen($row['carddata']);
-		}
-
-		return $row;
-	}
-
 	/**
 	 * Creates a new card.
 	 *

apps/dav/lib/CardDAV/Import/ImportCountEvent.php

@@ -10,7 +10,7 @@
 
 final readonly class ImportCountEvent implements ImportEvent {
 	public function __construct(
-		public int $vcard
+		public int $vcard,
 	) {
 	}
 

apps/dav/lib/CardDAV/Import/ImportService.php

@@ -132,7 +132,7 @@ public function importProcess($source, AddressBookImpl $addressBook, ContactsImp
 			$objectEntry = $this->backend->getCardByUID($addressBookId, $uid);
 			$objectData = $vObject->serialize();
 			try {
-				if ($objectEntry === false) {
+				if ($objectEntry === null) {
 					$objectUri = UUIDUtil::getUUID();
 					$this->backend->createCard(
 						$addressBookId,

apps/dav/lib/Controller/ContactsImportController.php

@@ -23,12 +23,12 @@
 use OCP\AppFramework\OCSController;
 use OCP\Contacts\ContactsImportOptions;
 use OCP\Contacts\IManager;
+use OCP\IAddressBookWritable;
 use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\ITempManager;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\IAddressBookWritable;
 
 class ContactsImportController extends OCSController {