diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 2148d8922837e..d23c3e7dc04b0 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -176,17 +176,8 @@ public function setVersion(string $version, string $fileName = 'apps.json', bool 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'); diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index c6781b03b023e..130e8d52e45a8 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -145,6 +145,7 @@ public function get($allowUnstable = false) { $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 []; }