From d6d8e9215c69a9e8d4bfa2035c657b0a037f3a2f Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Fri, 12 Mar 2021 11:20:04 +0100
Subject: Add a trashbin for calendars and calendar objects

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 apps/dav/appinfo/info.xml      |  4 +++-
 apps/dav/appinfo/v1/caldav.php | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'apps/dav/appinfo')

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index ff99623e382..c99d82a798d 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>WebDAV</name>
 	<summary>WebDAV endpoint</summary>
 	<description>WebDAV endpoint</description>
-	<version>1.17.2</version>
+	<version>1.18.0</version>
 	<licence>agpl</licence>
 	<author>owncloud.org</author>
 	<namespace>DAV</namespace>
@@ -24,6 +24,7 @@
 		<job>OCA\DAV\BackgroundJob\UpdateCalendarResourcesRoomsBackgroundJob</job>
 		<job>OCA\DAV\BackgroundJob\CleanupInvitationTokenJob</job>
 		<job>OCA\DAV\BackgroundJob\EventReminderJob</job>
+		<job>OCA\DAV\BackgroundJob\CalendarRetentionJob</job>
 	</background-jobs>
 
 	<repair-steps>
@@ -48,6 +49,7 @@
 		<command>OCA\DAV\Command\CreateCalendar</command>
 		<command>OCA\DAV\Command\MoveCalendar</command>
 		<command>OCA\DAV\Command\ListCalendars</command>
+		<command>OCA\DAV\Command\RetentionCleanupCommand</command>
 		<command>OCA\DAV\Command\SendEventReminders</command>
 		<command>OCA\DAV\Command\SyncBirthdayCalendar</command>
 		<command>OCA\DAV\Command\SyncSystemAddressBook</command>
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
index 236d81f66f8..19842c91f09 100644
--- a/apps/dav/appinfo/v1/caldav.php
+++ b/apps/dav/appinfo/v1/caldav.php
@@ -61,8 +61,20 @@ $random = \OC::$server->getSecureRandom();
 $logger = \OC::$server->getLogger();
 $dispatcher = \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class);
 $legacyDispatcher = \OC::$server->getEventDispatcher();
+$config = \OC::$server->get(\OCP\IConfig::class);
 
-$calDavBackend = new CalDavBackend($db, $principalBackend, $userManager, \OC::$server->getGroupManager(), $random, $logger, $dispatcher, $legacyDispatcher, true);
+$calDavBackend = new CalDavBackend(
+	$db,
+	$principalBackend,
+	$userManager,
+	\OC::$server->getGroupManager(),
+	$random,
+	$logger,
+	$dispatcher,
+	$legacyDispatcher,
+	$config,
+	true
+);
 
 $debugging = \OC::$server->getConfig()->getSystemValue('debug', false);
 $sendInvitations = \OC::$server->getConfig()->getAppValue('dav', 'sendInvitations', 'yes') === 'yes';
-- 
cgit v1.2.3