Adjust notifier registration for Nextcloud 17 API.

This patch implements the changes recommended in issue #610 following the overhaul of the notification API introduced in Nextcloud 17: * Update the signature of the INotifier::prepare method. * Use the new NotificationManager::registerNotifierService method instead of NotificationManager::registerNotifier (deprecated). Signed-off-by: Damien Goutte-Gattat <[email protected]>
nextcloud · Oct 1, 2019 · aefd7bd · aefd7bd
1 parent 27cbb82
commit aefd7bd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -23,19 +23,8 @@
 $app->registerNavigationEntry();
 $app->registerPersonalPage();
 
-
-$l = \OC::$server->getL10N('passman');
 $manager = \OC::$server->getNotificationManager();
-$manager->registerNotifier(function() {
-	return new Notifier(
-		\OC::$server->getL10NFactory()
-	);
-}, function() use ($l) {
-	return [
-		'id' => 'passman',
-		'name' => $l->t('Passwords'),
-	];
-});
+$manager->registerNotifierService(Notifier::class);
 
 /**
  * Loading translations

diff --git a/lib/Notifier.php b/lib/Notifier.php
@@ -37,7 +37,7 @@ public function __construct(\OCP\L10N\IFactory $factory) {
 	 * @param INotification $notification
 	 * @param string $languageCode The code of the language that should be used to prepare the notification
 	 */
-	public function prepare(INotification $notification, $languageCode) {
+	public function prepare(INotification $notification, string $languageCode): INotification {
 		if ($notification->getApp() !== 'passman') {
 			// Not my app => throw
 			throw new \InvalidArgumentException();
@@ -109,4 +109,22 @@ public function prepare(INotification $notification, $languageCode) {
 				throw new \InvalidArgumentException();
 		}
 	}
-}
+
+	/**
+	 * Identifier of the notifier
+	 *
+	 * @return string
+	 */
+	public function getID(): string {
+		return 'passman';
+	}
+
+	/**
+	 * Human readable name describing the notifier
+	 *
+	 * @return string
+	 */
+	public function getName(): string {
+		return $this->factory->get('passman')->t('Passwords');
+	}
+}