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>
nextcloud · Sep 9, 2024 · deb3617 · deb3617
1 parent a2cfcf3
commit deb3617
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -148,10 +148,17 @@ public function setVersion(string $version, string $fileName = 'apps.json', bool
 		$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);
+		$isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL;
+
+		if (!$appStoreEnabled || (!$internetAvailable && $isDefaultAppStore)) {
+			return [];
+		}
+
 		$apps = parent::get($allowPreReleases);
 		if (empty($apps)) {
 			$this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']);