upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #35291 from nextcloud/backport/35185/stable25

Browse source 
[stable25] Hide warning about missing apps for when shipped in the next version
This commit is contained in:
Vincent Petry 2022-11-21 09:32:38 +01:00 committed by GitHub
commit b4bccf1ea3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/updatenotification/lib/Controller/APIController.php
View 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)) {