From: Joas Schilling <coding@schilljs.com>
Date: Tue, 15 Nov 2022 16:40:26 +0000 (+0100)
Subject: Hide warning about missing apps for when shipped in the next version
X-Git-Tag: v26.0.0beta1~379^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7dccb8cd0cf881b1e56fe717f75139bffa14c7af;p=nextcloud-server.git

Hide warning about missing apps for when shipped in the next version

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/apps/updatenotification/lib/Controller/APIController.php b/apps/updatenotification/lib/Controller/APIController.php
index 9d5d1c2d764..75b847aceb3 100644
--- a/apps/updatenotification/lib/Controller/APIController.php
+++ b/apps/updatenotification/lib/Controller/APIController.php
@@ -57,6 +57,18 @@ class APIController extends OCSController {
 	/** @var string */
 	protected $language;
 
+	/**
+	 * List of apps that were in the appstore but are now shipped and don't have
+	 * a compatible update available.
+	 *
+	 * @var array<string, int>
+	 */
+	protected array $appsShippedInFutureVersion = [
+		'bruteforcesettings' => 25,
+		'suspicious_login' => 25,
+		'twofactor_totp' => 25,
+	];
+
 	public function __construct(string $appName,
 								IRequest $request,
 								IConfig $config,
@@ -92,7 +104,7 @@ class APIController extends OCSController {
 			} catch (AppPathNotFoundException $e) {
 				return false;
 			}
-			return !$this->appManager->isShipped($app);
+			return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
 		});
 
 		if (empty($installedApps)) {