From a16fd3991aa45914b868954c46c809b062127f1e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 29 Nov 2016 15:06:54 +0100 Subject: [PATCH] Move CalDAV activity settings to new API Signed-off-by: Joas Schilling --- apps/dav/appinfo/info.xml | 7 ++ apps/dav/lib/CalDAV/Activity/Extension.php | 25 +---- .../lib/CalDAV/Activity/Setting/Calendar.php | 98 +++++++++++++++++++ .../dav/lib/CalDAV/Activity/Setting/Event.php | 98 +++++++++++++++++++ apps/dav/lib/CalDAV/Activity/Setting/Todo.php | 98 +++++++++++++++++++ 5 files changed, 303 insertions(+), 23 deletions(-) create mode 100644 apps/dav/lib/CalDAV/Activity/Setting/Calendar.php create mode 100644 apps/dav/lib/CalDAV/Activity/Setting/Event.php create mode 100644 apps/dav/lib/CalDAV/Activity/Setting/Todo.php diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 71eac02cbe4..a8c4185f6c1 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -37,5 +37,12 @@ OCA\DAV\CalDAV\Activity\Filter\Calendar OCA\DAV\CalDAV\Activity\Filter\Todo + + + OCA\DAV\CalDAV\Activity\Setting\Calendar + OCA\DAV\CalDAV\Activity\Setting\Event + OCA\DAV\CalDAV\Activity\Setting\Todo + + diff --git a/apps/dav/lib/CalDAV/Activity/Extension.php b/apps/dav/lib/CalDAV/Activity/Extension.php index 3be68956903..47f4351aa49 100644 --- a/apps/dav/lib/CalDAV/Activity/Extension.php +++ b/apps/dav/lib/CalDAV/Activity/Extension.php @@ -73,13 +73,7 @@ class Extension implements IExtension { * @return array|false */ public function getNotificationTypes($languageCode) { - $l = $this->getL10N($languageCode); - - return array( - self::CALENDAR => (string) $l->t('A calendar was modified'), - self::CALENDAR_EVENT => (string) $l->t('A calendar event was modified'), - self::CALENDAR_TODO => (string) $l->t('A calendar todo was modified'), - ); + return false; } /** @@ -90,14 +84,7 @@ class Extension implements IExtension { * @return array|false */ public function getDefaultTypes($method) { - $defaultTypes = []; - if ($method === self::METHOD_STREAM) { - $defaultTypes[] = self::CALENDAR; - $defaultTypes[] = self::CALENDAR_EVENT; - $defaultTypes[] = self::CALENDAR_TODO; - } - - return $defaultTypes; + return false; } /** @@ -108,14 +95,6 @@ class Extension implements IExtension { * @return string|false */ public function getTypeIcon($type) { - switch ($type) { - case self::CALENDAR: - case self::CALENDAR_EVENT: - return 'icon-calendar-dark'; - case self::CALENDAR_TODO: - return 'icon-checkmark'; - } - return false; } diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php new file mode 100644 index 00000000000..608ee266bb9 --- /dev/null +++ b/apps/dav/lib/CalDAV/Activity/Setting/Calendar.php @@ -0,0 +1,98 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\CalDAV\Activity\Setting; + + +use OCP\Activity\ISetting; +use OCP\IL10N; + +class Calendar implements ISetting { + + /** @var IL10N */ + protected $l; + + /** + * @param IL10N $l + */ + public function __construct(IL10N $l) { + $this->l = $l; + } + + /** + * @return string Lowercase a-z and underscore only identifier + * @since 11.0.0 + */ + public function getIdentifier() { + return 'calendar'; + } + + /** + * @return string A translated string + * @since 11.0.0 + */ + public function getName() { + return $this->l->t('A calendar was modified'); + } + + /** + * @return int whether the filter should be rather on the top or bottom of + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. + * @since 11.0.0 + */ + public function getPriority() { + return 50; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function canChangeStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the mail + * @since 11.0.0 + */ + public function canChangeMail() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledMail() { + return false; + } +} + diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Event.php b/apps/dav/lib/CalDAV/Activity/Setting/Event.php new file mode 100644 index 00000000000..887cd22afad --- /dev/null +++ b/apps/dav/lib/CalDAV/Activity/Setting/Event.php @@ -0,0 +1,98 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\CalDAV\Activity\Setting; + + +use OCP\Activity\ISetting; +use OCP\IL10N; + +class Event implements ISetting { + + /** @var IL10N */ + protected $l; + + /** + * @param IL10N $l + */ + public function __construct(IL10N $l) { + $this->l = $l; + } + + /** + * @return string Lowercase a-z and underscore only identifier + * @since 11.0.0 + */ + public function getIdentifier() { + return 'calendar_event'; + } + + /** + * @return string A translated string + * @since 11.0.0 + */ + public function getName() { + return $this->l->t('A calendar event was modified'); + } + + /** + * @return int whether the filter should be rather on the top or bottom of + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. + * @since 11.0.0 + */ + public function getPriority() { + return 50; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function canChangeStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the mail + * @since 11.0.0 + */ + public function canChangeMail() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledMail() { + return false; + } +} + diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php new file mode 100644 index 00000000000..0c8215f4843 --- /dev/null +++ b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php @@ -0,0 +1,98 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\DAV\CalDAV\Activity\Setting; + + +use OCP\Activity\ISetting; +use OCP\IL10N; + +class Todo implements ISetting { + + /** @var IL10N */ + protected $l; + + /** + * @param IL10N $l + */ + public function __construct(IL10N $l) { + $this->l = $l; + } + + /** + * @return string Lowercase a-z and underscore only identifier + * @since 11.0.0 + */ + public function getIdentifier() { + return 'calendar_todos'; + } + + /** + * @return string A translated string + * @since 11.0.0 + */ + public function getName() { + return $this->l->t('A calendar todo was modified'); + } + + /** + * @return int whether the filter should be rather on the top or bottom of + * the admin section. The filters are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. + * @since 11.0.0 + */ + public function getPriority() { + return 50; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function canChangeStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledStream() { + return true; + } + + /** + * @return bool True when the option can be changed for the mail + * @since 11.0.0 + */ + public function canChangeMail() { + return true; + } + + /** + * @return bool True when the option can be changed for the stream + * @since 11.0.0 + */ + public function isDefaultEnabledMail() { + return false; + } +} + -- 2.39.5