Merge pull request #16528 from owncloud/activity-302-improve-settings

Activity 302 improve settings

2 files changed, 15 insertions, 2 deletions

diff --git a/lib/public/activity/iextension.php b/lib/public/activity/iextension.php
index 19d1d2e83a0..5d9fe3329ef 100644
--- a/lib/public/activity/iextension.php
+++ b/lib/public/activity/iextension.php
@@ -38,6 +38,8 @@ namespace OCP\Activity;
  * @since 8.0.0
  */
 interface IExtension {
+	const METHOD_STREAM = 'stream';
+	const METHOD_MAIL = 'email';
 
 	const PRIORITY_VERYLOW 	= 10;
 	const PRIORITY_LOW	= 20;
@@ -50,8 +52,13 @@ interface IExtension {
 	 * If no additional types are to be added false is to be returned
 	 *
 	 * @param string $languageCode
-	 * @return array|false
+	 * @return array|false Array "stringID of the type" => "translated string description for the setting"
+	 * 				or Array "stringID of the type" => [
+	 * 					'desc' => "translated string description for the setting"
+	 * 					'methods' => [self::METHOD_*],
+	 * 				]
 	 * @since 8.0.0
+	 * @changed 8.2.0 - Added support to allow limiting notifications to certain methods
 	 */
 	public function getNotificationTypes($languageCode);
 
diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php
index cadb37da03b..0f5dccd8ba1 100644
--- a/lib/public/activity/imanager.php
+++ b/lib/public/activity/imanager.php
@@ -81,9 +81,15 @@ interface IManager {
 
 	/**
 	 * Will return additional notification types as specified by other apps
+	 *
 	 * @param string $languageCode
-	 * @return array
+	 * @return array Array "stringID of the type" => "translated string description for the setting"
+	 * 				or Array "stringID of the type" => [
+	 * 					'desc' => "translated string description for the setting"
+	 * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
+	 * 				]
 	 * @since 8.0.0
+	 * @changed 8.2.0 - Added support to allow limiting notifications to certain methods
 	 */
 	function getNotificationTypes($languageCode);