Merge pull request #1754 from nextcloud/backport/1753/stable28

[stable28] fix(push): Allow apps to provide already parsed notifications
nextcloud · Dec 14, 2023 · d81c7d3 · d81c7d3
2 parents 99d8350 + b54846c
commit d81c7d3
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/lib/Push.php b/lib/Push.php
@@ -304,13 +304,15 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
 		$language = $this->l10nFactory->getUserLanguage($user);
 		$this->printInfo('Language is set to ' . $language);
 
-		try {
-			$this->notificationManager->setPreparingPushNotification(true);
-			$notification = $this->notificationManager->prepare($notification, $language);
-		} catch (\InvalidArgumentException $e) {
-			return;
-		} finally {
-			$this->notificationManager->setPreparingPushNotification(false);
+		if (!$notification->isValidParsed()) {
+			try {
+				$this->notificationManager->setPreparingPushNotification(true);
+				$notification = $this->notificationManager->prepare($notification, $language);
+			} catch (\InvalidArgumentException $e) {
+				return;
+			} finally {
+				$this->notificationManager->setPreparingPushNotification(false);
+			}
 		}
 
 		$userKey = $this->keyManager->getKey($user);