Loading patches/022-multiplenotification.patch +11 −59 Original line number Diff line number Diff line Loading @@ -720,81 +720,33 @@ +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider-new.php 2022-11-08 15:47:09.910075100 +0530 @@ -10,6 +10,7 @@ --- ./apps/dav/lib/CalDAV/Reminder/INotificationProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/INotificationProvider-new.php 2022-11-08 13:39:32.800075100 +0530 @@ -8,6 +8,7 @@ * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author Georg Ehrke <oc.list@georgehrke.com> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Citharel <nextcloud@tcit.fr> + * @author Richard Steinmetz <richard@steinmetz.cloud> * * @license GNU AGPL version 3 or any later version * @@ -32,12 +33,12 @@ use OCA\DAV\AppInfo\Application; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; -use OCP\ILogger; use OCP\IURLGenerator; use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; use OCP\Notification\IManager; use OCP\Notification\INotification; +use Psr\Log\LoggerInterface; use Sabre\VObject\Component\VEvent; use Sabre\VObject\Property; @@ -57,17 +58,9 @@ /** @var ITimeFactory */ private $timeFactory; - /** - * @param IConfig $config - * @param IManager $manager - * @param ILogger $logger - * @param L10NFactory $l10nFactory - * @param IUrlGenerator $urlGenerator - * @param ITimeFactory $timeFactory - */ public function __construct(IConfig $config, IManager $manager, - ILogger $logger, + LoggerInterface $logger, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, ITimeFactory $timeFactory) { @@ -81,11 +74,13 @@ @@ -42,10 +43,12 @@ * * @param VEvent $vevent * @param string $calendarDisplayName + * @param string[] $principalEmailAddresses + * @param string[] $principalEmailAddresses All email addresses associated to the principal owning the calendar object * @param IUser[] $users * @throws \Exception * @return void */ public function send(VEvent $vevent, - string $calendarDisplayName = null, + string $calendarDisplayName, string $calendarDisplayName, + array $principalEmailAddresses, array $users = []):void { if ($this->config->getAppValue('dav', 'sendEventRemindersPush', 'no') !== 'yes') { return; @@ -117,8 +112,6 @@ } /** - * @var VEvent $vevent - * @return array * @throws \Exception */ protected function extractEventDetails(VEvent $vevent):array { @@ -145,4 +138,4 @@ 'end_timezone' => $end->getDateTime()->getTimezone()->getName(), ]; } array $users = []): void; -} +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider-new.php 2022-11-08 15:47:09.910075100 +0530 @@ -10,6 +10,7 @@ Loading Loading
patches/022-multiplenotification.patch +11 −59 Original line number Diff line number Diff line Loading @@ -720,81 +720,33 @@ +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider-new.php 2022-11-08 15:47:09.910075100 +0530 @@ -10,6 +10,7 @@ --- ./apps/dav/lib/CalDAV/Reminder/INotificationProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/INotificationProvider-new.php 2022-11-08 13:39:32.800075100 +0530 @@ -8,6 +8,7 @@ * @author Christoph Wurst <christoph@winzerhof-wurst.at> * @author Georg Ehrke <oc.list@georgehrke.com> * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Thomas Citharel <nextcloud@tcit.fr> + * @author Richard Steinmetz <richard@steinmetz.cloud> * * @license GNU AGPL version 3 or any later version * @@ -32,12 +33,12 @@ use OCA\DAV\AppInfo\Application; use OCP\AppFramework\Utility\ITimeFactory; use OCP\IConfig; -use OCP\ILogger; use OCP\IURLGenerator; use OCP\IUser; use OCP\L10N\IFactory as L10NFactory; use OCP\Notification\IManager; use OCP\Notification\INotification; +use Psr\Log\LoggerInterface; use Sabre\VObject\Component\VEvent; use Sabre\VObject\Property; @@ -57,17 +58,9 @@ /** @var ITimeFactory */ private $timeFactory; - /** - * @param IConfig $config - * @param IManager $manager - * @param ILogger $logger - * @param L10NFactory $l10nFactory - * @param IUrlGenerator $urlGenerator - * @param ITimeFactory $timeFactory - */ public function __construct(IConfig $config, IManager $manager, - ILogger $logger, + LoggerInterface $logger, L10NFactory $l10nFactory, IURLGenerator $urlGenerator, ITimeFactory $timeFactory) { @@ -81,11 +74,13 @@ @@ -42,10 +43,12 @@ * * @param VEvent $vevent * @param string $calendarDisplayName + * @param string[] $principalEmailAddresses + * @param string[] $principalEmailAddresses All email addresses associated to the principal owning the calendar object * @param IUser[] $users * @throws \Exception * @return void */ public function send(VEvent $vevent, - string $calendarDisplayName = null, + string $calendarDisplayName, string $calendarDisplayName, + array $principalEmailAddresses, array $users = []):void { if ($this->config->getAppValue('dav', 'sendEventRemindersPush', 'no') !== 'yes') { return; @@ -117,8 +112,6 @@ } /** - * @var VEvent $vevent - * @return array * @throws \Exception */ protected function extractEventDetails(VEvent $vevent):array { @@ -145,4 +138,4 @@ 'end_timezone' => $end->getDateTime()->getTimezone()->getName(), ]; } array $users = []): void; -} +} \ No newline at end of file --- ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php 2022-09-06 21:39:44.135827300 +0530 +++ ./apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider-new.php 2022-11-08 15:47:09.910075100 +0530 @@ -10,6 +10,7 @@ Loading