diff --git a/apps/dav/lib/CardDAV/Activity/Backend.php b/apps/dav/lib/CardDAV/Activity/Backend.php index 8c8c643e2878f..53639f84f843e 100644 --- a/apps/dav/lib/CardDAV/Activity/Backend.php +++ b/apps/dav/lib/CardDAV/Activity/Backend.php @@ -129,7 +129,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([ @@ -188,7 +188,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) { @@ -433,7 +433,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 index be18fba96cc41..0f4acaaa434f9 100644 --- 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 index 9c909ae9bcd27..e2abdda161a16 100644 --- 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(); } diff --git a/apps/dav/tests/unit/CardDAV/Activity/BackendTest.php b/apps/dav/tests/unit/CardDAV/Activity/BackendTest.php index dbc2c3550e70d..4f3459233aa2e 100644 --- a/apps/dav/tests/unit/CardDAV/Activity/BackendTest.php +++ b/apps/dav/tests/unit/CardDAV/Activity/BackendTest.php @@ -226,7 +226,7 @@ public function testTriggerAddressBookActivity(string $action, array $data, arra ->willReturnSelf(); $event->expects($this->once()) ->method('setType') - ->with('addressbook') + ->with('contacts') ->willReturnSelf(); $event->expects($this->once()) ->method('setAuthor') @@ -396,7 +396,7 @@ public function testTriggerCardActivity(string $action, array $addressBookData, ->willReturnSelf(); $event->expects($this->once()) ->method('setType') - ->with('card') + ->with('contacts') ->willReturnSelf(); $event->expects($this->once()) ->method('setAuthor')