Merge pull request #33661 from nextcloud/backport/33651/stable23

nickvergessen · web-flow · commit 5786db50407b · 2022-08-23T23:35:31.000+02:00
[stable23] [stable24] Fix carddav activities
diff --git a/apps/dav/lib/CardDAV/Activity/Backend.php b/apps/dav/lib/CardDAV/Activity/Backend.php
@@ -116,7 +116,7 @@ protected function triggerAddressbookActivity(string $action, array $addressbook
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
 			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('addressbook')
+			->setType('contacts')
 			->setAuthor($currentUser);
 
 		$changedVisibleInformation = array_intersect([
@@ -170,7 +170,7 @@ public function onAddressbookUpdateShares(array $addressbookData, array $shares,
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
 			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('addressbook')
+			->setType('contacts')
 			->setAuthor($currentUser);
 
 		foreach ($remove as $principal) {
@@ -408,7 +408,7 @@ public function triggerCardActivity(string $action, array $addressbookData, arra
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('dav')
 			->setObject('addressbook', (int) $addressbookData['id'])
-			->setType('card')
+			->setType('contacts')
 			->setAuthor($currentUser);
 
 		$users = $this->getUsersForShares($shares);
diff --git a/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php b/apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php
@@ -72,7 +72,7 @@ public function __construct(IFactory $languageFactory,
 	 * @throws \InvalidArgumentException
 	 */
 	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'addressbook') {
+		if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
 			throw new \InvalidArgumentException();
 		}
 
diff --git a/apps/dav/lib/CardDAV/Activity/Provider/Card.php b/apps/dav/lib/CardDAV/Activity/Provider/Card.php
@@ -74,7 +74,7 @@ public function __construct(IFactory $languageFactory,
 	 * @throws \InvalidArgumentException
 	 */
 	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'card') {
+		if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
 			throw new \InvalidArgumentException();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct(IFactory $languageFactory,`
`72`	`72`	`* @throws \InvalidArgumentException`
`73`	`73`	`*/`
`74`	`74`	`public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {`
`75`		`- if ($event->getApp() !== 'dav' \|\| $event->getType() !== 'addressbook') {`
	`75`	`+ if ($event->getApp() !== 'dav' \|\| $event->getType() !== 'contacts') {`
`76`	`76`	`throw new \InvalidArgumentException();`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function __construct(IFactory $languageFactory,`
`74`	`74`	`* @throws \InvalidArgumentException`
`75`	`75`	`*/`
`76`	`76`	`public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {`
`77`		`- if ($event->getApp() !== 'dav' \|\| $event->getType() !== 'card') {`
	`77`	`+ if ($event->getApp() !== 'dav' \|\| $event->getType() !== 'contacts') {`
`78`	`78`	`throw new \InvalidArgumentException();`
`79`	`79`	`}`
`80`	`80`