Merge pull request #25538 from owncloud/enable_fav_mails

Activities: Enable Limit on favorites for Mail.
owncloud · Jul 19, 2017 · d5fbc7f · d5fbc7f
2 parents 17840e7 + 397343e
commit d5fbc7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/apps/files/lib/Activity.php b/apps/files/lib/Activity.php
@@ -105,10 +105,7 @@ public function getNotificationTypes($languageCode) {
 		return [
 			self::TYPE_SHARE_CREATED => (string) $l->t('A new file or folder has been <strong>created</strong>'),
 			self::TYPE_SHARE_CHANGED => (string) $l->t('A file or folder has been <strong>changed</strong>'),
-			self::TYPE_FAVORITES => [
-				'desc' => (string) $l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>'),
-				'methods' => [self::METHOD_STREAM],
-			],
+			self::TYPE_FAVORITES     => (string) $l->t('Limit notifications about creation and changes to your <strong>favorite files</strong>'),
 			self::TYPE_SHARE_DELETED => (string) $l->t('A file or folder has been <strong>deleted</strong>'),
 			self::TYPE_SHARE_RESTORED => (string) $l->t('A file or folder has been <strong>restored</strong>'),
 		];
@@ -420,6 +417,7 @@ public function getQueryForFilter($filter) {
 	 * @return bool
 	 */
 	protected function userSettingFavoritesOnly($user) {
-		return (bool) $this->config->getUserValue($user, 'activity', 'notify_' . self::METHOD_STREAM . '_' . self::TYPE_FAVORITES, false);
+		return (bool)$this->config->getUserValue($user, 'activity', 'notify_' . self::METHOD_STREAM . '_' . self::TYPE_FAVORITES, false) ||
+			(bool)$this->config->getUserValue($user, 'activity', 'notify_' . self::METHOD_MAIL . '_' . self::TYPE_FAVORITES, false);
 	}
 }
diff --git a/apps/files/tests/ActivityTest.php b/apps/files/tests/ActivityTest.php
@@ -118,6 +118,7 @@ public function testNotificationTypes() {
 		$this->assertArrayHasKey(Activity::TYPE_SHARE_CREATED, $result);
 		$this->assertArrayHasKey(Activity::TYPE_SHARE_CHANGED, $result);
 		$this->assertArrayHasKey(Activity::TYPE_FAVORITES, $result);
+		$this->assertEquals($result[Activity::TYPE_FAVORITES], 'Limit notifications about creation and changes to your <strong>favorite files</strong>');
 		$this->assertArrayHasKey(Activity::TYPE_SHARE_DELETED, $result);
 		$this->assertArrayHasKey(Activity::TYPE_SHARE_RESTORED, $result);
 	}