Skip to content

Commit 23e8424

Browse files
committed
fix(appstoreFetcher): get app list from custom app store
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
1 parent 07ce8c7 commit 23e8424

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

lib/private/App/AppStore/Fetcher/AppFetcher.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,6 @@ public function setVersion(string $version, string $fileName = 'apps.json', bool
176176
public function get($allowUnstable = false): array {
177177
$allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git';
178178

179-
$appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true);
180-
$internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true);
181-
182-
if (!$appStoreEnabled || !$internetAvailable) {
183-
$this->logger->info('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']);
184-
return [];
185-
}
186-
187179
$apps = parent::get($allowPreReleases);
188180
if (empty($apps)) {
189181
return [];

lib/private/App/AppStore/Fetcher/Fetcher.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ public function get($allowUnstable = false) {
145145
$isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL;
146146

147147
if (!$appstoreenabled || (!$internetavailable && $isDefaultAppStore)) {
148+
$this->logger->info('AppStore is disabled or this instance has no Internet connection to access the default app store', ['app' => 'appstoreFetcher']);
148149
return [];
149150
}
150151

0 commit comments

Comments
 (0)