Skip to content

[stable28] fix(appstoreFetcher): get list from a custom store and remove unnecessary warning #48166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShGKme merged 2 commits into from
Sep 22, 2024
Merged

[stable28] fix(appstoreFetcher): get list from a custom store and remove unnecessary warning #48166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db00b7
fix(appstoreFetcher): remove unneeded warning
ShGKme Sep 16, 2024
5fa2c4a
fix(appstoreFetcher): get app list from custom app store
ShGKme Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions lib/private/App/AppStore/Fetcher/AppFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,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');
Expand Down
1 change: 1 addition & 0 deletions lib/private/App/AppStore/Fetcher/Fetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,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 [];
}

Expand Down