Merge pull request #48165 from nextcloud/backport/48114/stable29

[stable29] fix(appstoreFetcher): get list from a custom store and remove unnecessary warning
nextcloud · Sep 23, 2024 · d306a00 · d306a00
2 parents 2fef861 + 23e8424
commit d306a00
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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 [];
 		}