merge file activity settings into a single 'favorite changed' item

apps/files/appinfo/info.xml

@@ -40,10 +40,7 @@
 		<settings>
 			<setting>OCA\Files\Activity\Settings\FavoriteAction</setting>
 			<setting>OCA\Files\Activity\Settings\FileChanged</setting>
-			<setting>OCA\Files\Activity\Settings\FileCreated</setting>
-			<setting>OCA\Files\Activity\Settings\FileDeleted</setting>
-			<setting>OCA\Files\Activity\Settings\FileFavorite</setting>
-			<setting>OCA\Files\Activity\Settings\FileRestored</setting>
+			<setting>OCA\Files\Activity\Settings\FileFavoriteChanged</setting>
 		</settings>
 
 		<filters>

apps/files/composer/composer/autoload_classmap.php

@@ -14,10 +14,7 @@
     'OCA\\Files\\Activity\\Settings\\FavoriteAction' => $baseDir . '/../lib/Activity/Settings/FavoriteAction.php',
     'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
     'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
-    'OCA\\Files\\Activity\\Settings\\FileCreated' => $baseDir . '/../lib/Activity/Settings/FileCreated.php',
-    'OCA\\Files\\Activity\\Settings\\FileDeleted' => $baseDir . '/../lib/Activity/Settings/FileDeleted.php',
-    'OCA\\Files\\Activity\\Settings\\FileFavorite' => $baseDir . '/../lib/Activity/Settings/FileFavorite.php',
-    'OCA\\Files\\Activity\\Settings\\FileRestored' => $baseDir . '/../lib/Activity/Settings/FileRestored.php',
+    'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
     'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
     'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',

apps/files/composer/composer/autoload_static.php

@@ -29,10 +29,7 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Activity\\Settings\\FavoriteAction' => __DIR__ . '/..' . '/../lib/Activity/Settings/FavoriteAction.php',
         'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
         'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
-        'OCA\\Files\\Activity\\Settings\\FileCreated' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileCreated.php',
-        'OCA\\Files\\Activity\\Settings\\FileDeleted' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileDeleted.php',
-        'OCA\\Files\\Activity\\Settings\\FileFavorite' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavorite.php',
-        'OCA\\Files\\Activity\\Settings\\FileRestored' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileRestored.php',
+        'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
         'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
         'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',

apps/files/lib/Activity/Settings/FileChanged.php

@@ -37,7 +37,7 @@ public function getIdentifier() {
 	 * @since 11.0.0
 	 */
 	public function getName() {
-		return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>');
+		return $this->l->t('A file or folder has been <strong>changed</strong>');
 	}
 
 	/**
@@ -50,35 +50,19 @@ public function getPriority() {
 		return 1;
 	}
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
+	public function canChangeMail() {
+		return false;
 	}
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
+	public function isDefaultEnabledMail() {
+		return false;
 	}
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
+	public function canChangeNotification() {
+		return false;
 	}
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
+	public function isDefaultEnabledNotification() {
 		return false;
 	}
 }

apps/files/lib/Activity/Settings/FileCreated.php → apps/files/lib/Activity/Settings/FileFavoriteChanged.php

@@ -23,21 +23,21 @@
 
 namespace OCA\Files\Activity\Settings;
 
-class FileCreated extends FileActivitySettings {
+class FileFavoriteChanged extends FileActivitySettings {
 	/**
 	 * @return string Lowercase a-z and underscore only identifier
 	 * @since 11.0.0
 	 */
 	public function getIdentifier() {
-		return 'file_created';
+		return 'file_favorite_changed';
 	}
 
 	/**
 	 * @return string A translated string
 	 * @since 11.0.0
 	 */
 	public function getName() {
-		return $this->l->t('A new file or folder has been <strong>created</strong>');
+		return $this->l->t('A favorite file or folder has been <strong>changed</strong>');
 	}
 
 	/**
@@ -47,7 +47,7 @@ public function getName() {
 	 * @since 11.0.0
 	 */
 	public function getPriority() {
-		return 0;
+		return 1;
 	}
 
 	/**
@@ -81,4 +81,8 @@ public function canChangeMail() {
 	public function isDefaultEnabledMail() {
 		return false;
 	}
+
+	public function isDefaultEnabledNotification() {
+		return true;
+	}
 }