Merge pull request #36131 from nextcloud/revert/32057

Revert "Fix sync errors for card creation with the same uri from different sources"
nextcloud · Jan 13, 2023 · 97e83c3 · 97e83c3
2 parents 62476a3 + e6f4705
commit 97e83c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
@@ -47,14 +47,12 @@ public function createCardFromUser(IUser $user): ?VCard {
 		$userProperties = $this->accountManager->getAccount($user)->getProperties();
 
 		$uid = $user->getUID();
-		$backendClassName = $user->getBackendClassName();
 		$cloudId = $user->getCloudId();
 		$image = $this->getAvatarImage($user);
 
 		$vCard = new VCard();
 		$vCard->VERSION = '3.0';
-		$vCard->UID = md5("$backendClassName:$uid");
-	 	$vCard->add(new Text($vCard, 'X-NEXTCLOUD-UID', $uid));
+		$vCard->UID = $uid;
 
 		$publish = false;
 

diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php
@@ -274,7 +274,7 @@ public function syncInstance(\Closure $progressCallback = null) {
 		$allCards = $this->backend->getCards($systemAddressBook['id']);
 		foreach ($allCards as $card) {
 			$vCard = Reader::read($card['carddata']);
-			$uid = isset($vCard->{'X-NEXTCLOUD-UID'}) ? $vCard->{'X-NEXTCLOUD-UID'}->getValue() : $vCard->UID->getValue();
+			$uid = $vCard->UID->getValue();
 			// load backend and see if user exists
 			if (!$this->userManager->userExists($uid)) {
 				$this->deleteUser($card['uri']);