diff options
| author | Git'Fellow <12234510+solracsf@users.noreply.github.com> | 2024-09-09 09:29:09 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-09-10 14:32:20 +0000 |
| commit | f8f8acef838377b65f9a29f9fc3e7e15cd633adc (patch) | |
| tree | c903096848886421827a09711c69240bb9131bcf | |
| parent | 3c2ead71330b2510b2266c9883d1d0b157424425 (diff) | |
| download | nextcloud-server-f8f8acef838377b65f9a29f9fc3e7e15cd633adc.tar.gz nextcloud-server-f8f8acef838377b65f9a29f9fc3e7e15cd633adc.zip | |
fix(appstore): return if appstore is manually disabled
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: camel case
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: log a debug log
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: typing
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: typo
fix: typing
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/AppFetcher.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 3f7f5e0a3bd..6deeed98f0c 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -180,10 +180,17 @@ class AppFetcher extends Fetcher { $this->ignoreMaxVersion = $ignoreMaxVersion; } - - public function get($allowUnstable = false) { + public function get($allowUnstable = false): array { $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; + $appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true); + $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); + + if (!$appStoreEnabled || !$internetAvailable) { + $this->logger->debug('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); + return []; + } + $apps = parent::get($allowPreReleases); if (empty($apps)) { $this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']); |