Skip to content

[stable25] Hide warning about missing apps for when shipped in the next version #35291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Nov 21, 2022
Merged

[stable25] Hide warning about missing apps for when shipped in the next version #35291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Hide warning about missing apps for when shipped in the next version 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot-nextcloud
nickvergessen authored and backportbot-nextcloud[bot] committed Nov 21, 2022
commit 9b652c787fe1777a2a590abee479ee6804ed09d6
14 changes: 13 additions & 1 deletion apps/updatenotification/lib/Controller/APIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -92,7 +104,7 @@ public function getAppList(string $newVersion): DataResponse {
} catch (AppPathNotFoundException $e) {
return false;
}
return !$this->appManager->isShipped($app);
return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
});

if (empty($installedApps)) {
Expand Down