diff --git a/lib/Controller/IdentifyAccountController.php b/lib/Controller/IdentifyAccountController.php index 4dff5d32a..620bc78b8 100644 --- a/lib/Controller/IdentifyAccountController.php +++ b/lib/Controller/IdentifyAccountController.php @@ -279,6 +279,13 @@ class IdentifyAccountController extends AEnvironmentAwareController { } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); if (!$adminSetting) { return true; diff --git a/lib/Listener/MailNotifyListener.php b/lib/Listener/MailNotifyListener.php index df529cfde..a9bfb7c81 100644 --- a/lib/Listener/MailNotifyListener.php +++ b/lib/Listener/MailNotifyListener.php @@ -174,6 +174,13 @@ class MailNotifyListener implements IEventListener { } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('email', $type); if (!$adminSetting) { return true; diff --git a/lib/Listener/NotificationListener.php b/lib/Listener/NotificationListener.php index a3ceecb7f..f9cc705e2 100644 --- a/lib/Listener/NotificationListener.php +++ b/lib/Listener/NotificationListener.php @@ -210,6 +210,13 @@ class NotificationListener implements IEventListener { } $activityUserSettings = \OCP\Server::get(\OCA\Activity\UserSettings::class); if ($activityUserSettings) { + $manager = \OCP\Server::get(\OCP\Activity\IManager::class); + try { + $manager->getSettingById($type); + } catch (\Exception $e) { + return false; + } + $adminSetting = $activityUserSettings->getAdminSetting('notification', $type); if (!$adminSetting) { return true;