Skip to content

Commit 17d0dac

Browse files
skjnldsvskjnldsv
authored
Merge pull request #27061 from nextcloud/feature/noid/contacts-activity
2 parents bce941e + 2a2ca4d commit 17d0dac

14 files changed

Lines changed: 1411 additions & 1 deletion

File tree

‎apps/dav/appinfo/info.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,21 @@
6363
<setting>OCA\DAV\CalDAV\Activity\Setting\Calendar</setting>
6464
<setting>OCA\DAV\CalDAV\Activity\Setting\Event</setting>
6565
<setting>OCA\DAV\CalDAV\Activity\Setting\Todo</setting>
66+
<setting>OCA\DAV\CardDAV\Activity\Setting</setting>
6667
</settings>
6768

6869
<filters>
6970
<filter>OCA\DAV\CalDAV\Activity\Filter\Calendar</filter>
7071
<filter>OCA\DAV\CalDAV\Activity\Filter\Todo</filter>
72+
<filter>OCA\DAV\CardDAV\Activity\Filter</filter>
7173
</filters>
7274

7375
<providers>
7476
<provider>OCA\DAV\CalDAV\Activity\Provider\Calendar</provider>
7577
<provider>OCA\DAV\CalDAV\Activity\Provider\Event</provider>
7678
<provider>OCA\DAV\CalDAV\Activity\Provider\Todo</provider>
79+
<provider>OCA\DAV\CardDAV\Activity\Provider\Addressbook</provider>
80+
<provider>OCA\DAV\CardDAV\Activity\Provider\Card</provider>
7781
</providers>
7882
</activity>
7983

‎apps/dav/composer/composer/autoload_classmap.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => $baseDir . '/../lib/CalDAV/WebcalCaching/Plugin.php',
8686
'OCA\\DAV\\CalDAV\\WebcalCaching\\RefreshWebcalService' => $baseDir . '/../lib/CalDAV/WebcalCaching/RefreshWebcalService.php',
8787
'OCA\\DAV\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
88+
'OCA\\DAV\\CardDAV\\Activity\\Backend' => $baseDir . '/../lib/CardDAV/Activity/Backend.php',
89+
'OCA\\DAV\\CardDAV\\Activity\\Filter' => $baseDir . '/../lib/CardDAV/Activity/Filter.php',
90+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Addressbook' => $baseDir . '/../lib/CardDAV/Activity/Provider/Addressbook.php',
91+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Base' => $baseDir . '/../lib/CardDAV/Activity/Provider/Base.php',
92+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Card' => $baseDir . '/../lib/CardDAV/Activity/Provider/Card.php',
93+
'OCA\\DAV\\CardDAV\\Activity\\Setting' => $baseDir . '/../lib/CardDAV/Activity/Setting.php',
8894
'OCA\\DAV\\CardDAV\\AddressBook' => $baseDir . '/../lib/CardDAV/AddressBook.php',
8995
'OCA\\DAV\\CardDAV\\AddressBookImpl' => $baseDir . '/../lib/CardDAV/AddressBookImpl.php',
9096
'OCA\\DAV\\CardDAV\\AddressBookRoot' => $baseDir . '/../lib/CardDAV/AddressBookRoot.php',
@@ -206,9 +212,11 @@
206212
'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => $baseDir . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
207213
'OCA\\DAV\\HookManager' => $baseDir . '/../lib/HookManager.php',
208214
'OCA\\DAV\\Listener\\ActivityUpdaterListener' => $baseDir . '/../lib/Listener/ActivityUpdaterListener.php',
215+
'OCA\\DAV\\Listener\\AddressbookListener' => $baseDir . '/../lib/Listener/AddressbookListener.php',
209216
'OCA\\DAV\\Listener\\CalendarContactInteractionListener' => $baseDir . '/../lib/Listener/CalendarContactInteractionListener.php',
210217
'OCA\\DAV\\Listener\\CalendarDeletionDefaultUpdaterListener' => $baseDir . '/../lib/Listener/CalendarDeletionDefaultUpdaterListener.php',
211218
'OCA\\DAV\\Listener\\CalendarObjectReminderUpdaterListener' => $baseDir . '/../lib/Listener/CalendarObjectReminderUpdaterListener.php',
219+
'OCA\\DAV\\Listener\\CardListener' => $baseDir . '/../lib/Listener/CardListener.php',
212220
'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndex.php',
213221
'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => $baseDir . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
214222
'OCA\\DAV\\Migration\\BuildSocialSearchIndex' => $baseDir . '/../lib/Migration/BuildSocialSearchIndex.php',

‎apps/dav/composer/composer/autoload_static.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ class ComposerStaticInitDAV
100100
'OCA\\DAV\\CalDAV\\WebcalCaching\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/WebcalCaching/Plugin.php',
101101
'OCA\\DAV\\CalDAV\\WebcalCaching\\RefreshWebcalService' => __DIR__ . '/..' . '/../lib/CalDAV/WebcalCaching/RefreshWebcalService.php',
102102
'OCA\\DAV\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
103+
'OCA\\DAV\\CardDAV\\Activity\\Backend' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Backend.php',
104+
'OCA\\DAV\\CardDAV\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Filter.php',
105+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Addressbook' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Provider/Addressbook.php',
106+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Base' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Provider/Base.php',
107+
'OCA\\DAV\\CardDAV\\Activity\\Provider\\Card' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Provider/Card.php',
108+
'OCA\\DAV\\CardDAV\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/CardDAV/Activity/Setting.php',
103109
'OCA\\DAV\\CardDAV\\AddressBook' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBook.php',
104110
'OCA\\DAV\\CardDAV\\AddressBookImpl' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookImpl.php',
105111
'OCA\\DAV\\CardDAV\\AddressBookRoot' => __DIR__ . '/..' . '/../lib/CardDAV/AddressBookRoot.php',
@@ -221,9 +227,11 @@ class ComposerStaticInitDAV
221227
'OCA\\DAV\\Files\\Sharing\\PublicLinkCheckPlugin' => __DIR__ . '/..' . '/../lib/Files/Sharing/PublicLinkCheckPlugin.php',
222228
'OCA\\DAV\\HookManager' => __DIR__ . '/..' . '/../lib/HookManager.php',
223229
'OCA\\DAV\\Listener\\ActivityUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/ActivityUpdaterListener.php',
230+
'OCA\\DAV\\Listener\\AddressbookListener' => __DIR__ . '/..' . '/../lib/Listener/AddressbookListener.php',
224231
'OCA\\DAV\\Listener\\CalendarContactInteractionListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarContactInteractionListener.php',
225232
'OCA\\DAV\\Listener\\CalendarDeletionDefaultUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarDeletionDefaultUpdaterListener.php',
226233
'OCA\\DAV\\Listener\\CalendarObjectReminderUpdaterListener' => __DIR__ . '/..' . '/../lib/Listener/CalendarObjectReminderUpdaterListener.php',
234+
'OCA\\DAV\\Listener\\CardListener' => __DIR__ . '/..' . '/../lib/Listener/CardListener.php',
227235
'OCA\\DAV\\Migration\\BuildCalendarSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndex.php',
228236
'OCA\\DAV\\Migration\\BuildCalendarSearchIndexBackgroundJob' => __DIR__ . '/..' . '/../lib/Migration/BuildCalendarSearchIndexBackgroundJob.php',
229237
'OCA\\DAV\\Migration\\BuildSocialSearchIndex' => __DIR__ . '/..' . '/../lib/Migration/BuildSocialSearchIndex.php',

‎apps/dav/lib/AppInfo/Application.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,27 @@
5151
use OCA\DAV\CardDAV\ContactsManager;
5252
use OCA\DAV\CardDAV\PhotoCache;
5353
use OCA\DAV\CardDAV\SyncService;
54+
use OCA\DAV\Events\AddressBookCreatedEvent;
55+
use OCA\DAV\Events\AddressBookDeletedEvent;
56+
use OCA\DAV\Events\AddressBookShareUpdatedEvent;
57+
use OCA\DAV\Events\AddressBookUpdatedEvent;
5458
use OCA\DAV\Events\CalendarCreatedEvent;
5559
use OCA\DAV\Events\CalendarDeletedEvent;
5660
use OCA\DAV\Events\CalendarObjectCreatedEvent;
5761
use OCA\DAV\Events\CalendarObjectDeletedEvent;
5862
use OCA\DAV\Events\CalendarObjectUpdatedEvent;
5963
use OCA\DAV\Events\CalendarShareUpdatedEvent;
6064
use OCA\DAV\Events\CalendarUpdatedEvent;
65+
use OCA\DAV\Events\CardCreatedEvent;
66+
use OCA\DAV\Events\CardDeletedEvent;
67+
use OCA\DAV\Events\CardUpdatedEvent;
6168
use OCA\DAV\HookManager;
6269
use OCA\DAV\Listener\ActivityUpdaterListener;
70+
use OCA\DAV\Listener\AddressbookListener;
6371
use OCA\DAV\Listener\CalendarContactInteractionListener;
6472
use OCA\DAV\Listener\CalendarDeletionDefaultUpdaterListener;
6573
use OCA\DAV\Listener\CalendarObjectReminderUpdaterListener;
74+
use OCA\DAV\Listener\CardListener;
6675
use OCA\DAV\Search\ContactsSearchProvider;
6776
use OCA\DAV\Search\EventsSearchProvider;
6877
use OCA\DAV\Search\TasksSearchProvider;
@@ -131,6 +140,15 @@ public function register(IRegistrationContext $context): void {
131140
$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
132141
$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
133142

143+
144+
$context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
145+
$context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
146+
$context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
147+
$context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
148+
$context->registerEventListener(CardCreatedEvent::class, CardListener::class);
149+
$context->registerEventListener(CardDeletedEvent::class, CardListener::class);
150+
$context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
151+
134152
$context->registerNotifierService(Notifier::class);
135153
}
136154

‎apps/dav/lib/CalDAV/Activity/Setting/CalDAVSetting.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ public function getGroupIdentifier() {
4545
}
4646

4747
public function getGroupName() {
48-
return $this->l->t('Calendar and tasks');
48+
return $this->l->t('Calendar, contacts and tasks');
4949
}
5050
}

0 commit comments

Comments
 (0)