]> source.dussan.org Git - nextcloud-server.git/commitdiff
Hide warning about missing apps for when shipped in the next version 35292/head
authorJoas Schilling <coding@schilljs.com>
Tue, 15 Nov 2022 16:40:26 +0000 (17:40 +0100)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Mon, 21 Nov 2022 07:18:44 +0000 (07:18 +0000)
Signed-off-by: Joas Schilling <coding@schilljs.com>
apps/updatenotification/lib/Controller/APIController.php

index 9d5d1c2d764b0f021a353646b23f365e3e849763..75b847aceb3fb38bd8101591b0b9b0f0242fd1e4 100644 (file)
@@ -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)) {