upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 23:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 45

Merge pull request #48127 from nextcloud/backport/48114/stable30

Browse source 
[stable30] fix(appstoreFetcher): get list from a custom store and remove unnecessary warning
This commit is contained in:
Grigorii K. Shartsev 2024-09-24 00:10:22 +05:00 committed by GitHub
commit 8b56189f65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/App/AppStore/Fetcher/AppFetcher.php
View file

@ -152,17 +152,8 @@ class AppFetcher extends Fetcher {
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->info('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']);
return [];
}
$allowList = $this->config->getSystemValue('appsallowlist');

1
lib/private/App/AppStore/Fetcher/Fetcher.php
View file

@ -121,6 +121,7 @@ abstract class Fetcher {
$isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL;
if (!$appstoreenabled || (!$internetavailable && $isDefaultAppStore)) {
$this->logger->info('AppStore is disabled or this instance has no Internet connection to access the default app store', ['app' => 'appstoreFetcher']);
return [];
}