Merge pull request #17148 from nextcloud/always-provide-color-to-default-personal-calendar

Always provide theme color for default personal calendar

1 files changed, 8 insertions, 0 deletions

diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php
index 3929fdabbd0..03e7551e971 100644
--- a/apps/dav/lib/HookManager.php
+++ b/apps/dav/lib/HookManager.php
@@ -31,6 +31,7 @@ namespace OCA\DAV;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\CardDAV\SyncService;
+use OCP\Defaults;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Util;
@@ -59,6 +60,9 @@ class HookManager {
 	/** @var array */
 	private $addressBooksToDelete = [];
 
+	/** @var Defaults */
+	private $themingDefaults;
+
 	/** @var EventDispatcherInterface */
 	private $eventDispatcher;
 
@@ -66,11 +70,13 @@ class HookManager {
 								SyncService $syncService,
 								CalDavBackend $calDav,
 								CardDavBackend $cardDav,
+								Defaults $themingDefaults,
 								EventDispatcherInterface $eventDispatcher) {
 		$this->userManager = $userManager;
 		$this->syncService = $syncService;
 		$this->calDav = $calDav;
 		$this->cardDav = $cardDav;
+		$this->themingDefaults = $themingDefaults;
 		$this->eventDispatcher = $eventDispatcher;
 	}
 
@@ -156,6 +162,8 @@ class HookManager {
 				try {
 					$this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
 						'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+						'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
+						'components' => 'VEVENT'
 					]);
 				} catch (\Exception $ex) {
 					\OC::$server->getLogger()->logException($ex);