summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2022-11-21 07:36:42 +0100
committerGitHub <noreply@github.com>2022-11-21 07:36:42 +0100
commitaad8b303985543fab9b9f9c01b6cca9dc4f7807e (patch)
tree0de0c23e01593f3131644d0b054e7580e6d24ea2 /apps
parente275dc03aa568e9c4bfa9218eb371e7a4f34e34d (diff)
parent7dccb8cd0cf881b1e56fe717f75139bffa14c7af (diff)
downloadnextcloud-server-aad8b303985543fab9b9f9c01b6cca9dc4f7807e.tar.gz
nextcloud-server-aad8b303985543fab9b9f9c01b6cca9dc4f7807e.zip
Merge pull request #35185 from nextcloud/bugfix/noid/hide-not-missing-updates-of-future-shipped-apps
Hide warning about missing apps for when shipped in the next version
Diffstat (limited to 'apps')
-rw-r--r--apps/updatenotification/lib/Controller/APIController.php14
1 files changed, 13 insertions, 1 deletions
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)) {