From 9da1675c9e715c117b134a3fcec8e352c30ef33e Mon Sep 17 00:00:00 2001 From: "Grigorii K. Shartsev" Date: Tue, 17 Sep 2024 01:24:49 +0200 Subject: [PATCH 1/2] fix(appstoreFetcher): remove unneeded warning Signed-off-by: Grigorii K. Shartsev --- lib/private/App/AppStore/Fetcher/AppFetcher.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 4ef0b1eb51bca..30053034b8029 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -162,7 +162,6 @@ public function get($allowUnstable = false): array { $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'); From 3ee3542bdfc192ec8e3fcc3d4861b6d3142e9ef1 Mon Sep 17 00:00:00 2001 From: "Grigorii K. Shartsev" Date: Tue, 17 Sep 2024 01:29:25 +0200 Subject: [PATCH 2/2] fix(appstoreFetcher): get app list from custom app store Signed-off-by: Grigorii K. Shartsev --- lib/private/App/AppStore/Fetcher/AppFetcher.php | 8 -------- lib/private/App/AppStore/Fetcher/Fetcher.php | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 30053034b8029..e7ab2f9c377be 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -152,14 +152,6 @@ 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)) { return []; diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index bc85be662df1e..edb96b55f0a1f 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -121,6 +121,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 []; }