diff --git a/apps/files_reminders/composer/composer/autoload_classmap.php b/apps/files_reminders/composer/composer/autoload_classmap.php
index c0fbf528f1530..f3a95a64e74c6 100644
--- a/apps/files_reminders/composer/composer/autoload_classmap.php
+++ b/apps/files_reminders/composer/composer/autoload_classmap.php
@@ -26,4 +26,5 @@
'OCA\\FilesReminders\\Model\\RichReminder' => $baseDir . '/../lib/Model/RichReminder.php',
'OCA\\FilesReminders\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
'OCA\\FilesReminders\\Service\\ReminderService' => $baseDir . '/../lib/Service/ReminderService.php',
+ 'OCA\\FilesReminders\\SetupChecks\\NeedNotificationsApp' => $baseDir . '/../lib/SetupChecks/NeedNotificationsApp.php',
);
diff --git a/apps/files_reminders/composer/composer/autoload_static.php b/apps/files_reminders/composer/composer/autoload_static.php
index 32660dfedc91b..6a6475e03dee5 100644
--- a/apps/files_reminders/composer/composer/autoload_static.php
+++ b/apps/files_reminders/composer/composer/autoload_static.php
@@ -41,6 +41,7 @@ class ComposerStaticInitFilesReminders
'OCA\\FilesReminders\\Model\\RichReminder' => __DIR__ . '/..' . '/../lib/Model/RichReminder.php',
'OCA\\FilesReminders\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
'OCA\\FilesReminders\\Service\\ReminderService' => __DIR__ . '/..' . '/../lib/Service/ReminderService.php',
+ 'OCA\\FilesReminders\\SetupChecks\\NeedNotificationsApp' => __DIR__ . '/..' . '/../lib/SetupChecks/NeedNotificationsApp.php',
);
public static function getInitializer(ClassLoader $loader)
diff --git a/apps/files_reminders/lib/AppInfo/Application.php b/apps/files_reminders/lib/AppInfo/Application.php
index 0ad503264d24a..2776e9db0b11e 100644
--- a/apps/files_reminders/lib/AppInfo/Application.php
+++ b/apps/files_reminders/lib/AppInfo/Application.php
@@ -16,6 +16,7 @@
use OCA\FilesReminders\Listener\SabrePluginAddListener;
use OCA\FilesReminders\Listener\UserDeletedListener;
use OCA\FilesReminders\Notification\Notifier;
+use OCA\FilesReminders\SetupChecks\NeedNotificationsApp;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap;
diff --git a/apps/files_reminders/lib/Notification/Notifier.php b/apps/files_reminders/lib/Notification/Notifier.php
index 565ef9a469558..337ef04c8143e 100644
--- a/apps/files_reminders/lib/Notification/Notifier.php
+++ b/apps/files_reminders/lib/Notification/Notifier.php
@@ -76,7 +76,7 @@ public function prepare(INotification $notification, string $languageCode): INot
[
'name' => [
'type' => 'highlight',
- 'id' => $node->getId(),
+ 'id' => (string)$node->getId(),
'name' => $node->getName(),
],
],
diff --git a/apps/files_reminders/lib/SetupChecks/NeedNotificationsApp.php b/apps/files_reminders/lib/SetupChecks/NeedNotificationsApp.php
index 2fc80094152be..1dc7d652c6731 100644
--- a/apps/files_reminders/lib/SetupChecks/NeedNotificationsApp.php
+++ b/apps/files_reminders/lib/SetupChecks/NeedNotificationsApp.php
@@ -7,15 +7,17 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
-namespace OCA\DAV\SetupChecks;
+namespace OCA\FilesReminders\SetupChecks;
use OCP\App\IAppManager;
+use OCP\IL10N;
use OCP\SetupCheck\ISetupCheck;
use OCP\SetupCheck\SetupResult;
class NeedNotificationsApp implements ISetupCheck {
public function __construct(
private IAppManager $appManager,
+ private IL10N $l10n,
) {
}
@@ -28,7 +30,7 @@ public function getCategory(): string {
}
public function run(): SetupResult {
- if ($this->appManager->isInstalled('notifications')) {
+ if ($this->appManager->isEnabledForAnyone('notifications')) {
return SetupResult::success($this->l10n->t('This files_reminder can work properly.'));
} else {
return SetupResult::warning($this->l10n->t('The files_reminder app needs the notification app to work properly. You should either enable notifications or disable files_reminder.'));
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index dc24381b95ac7..1a94fd88a17f5 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -843,6 +843,12 @@
+
+
+
+
+
+
diff --git a/psalm.xml b/psalm.xml
index 22428fb472536..0fdbc287b5ab1 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -30,6 +30,7 @@
+