Skip to content

If there is no internet connection don't try to contact appstore #7121

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
rullzer merged 2 commits into from
Nov 17, 2017
Merged

If there is no internet connection don't try to contact appstore #7121

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
2eb2b6e
If there is no internet connection don't try to contact appstore
rullzer Nov 9, 2017
6bbda28
Fix tests
rullzer Nov 17, 2017
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
3 changes: 2 additions & 1 deletion lib/private/App/AppStore/Fetcher/Fetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ protected function fetch($ETag, $content) {
*/
public function get() {
$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
$internetavailable = $this->config->getSystemValue('has_internet_connection', true);

if (!$appstoreenabled) {
if (!$appstoreenabled || !$internetavailable) {
return [];
}

Expand Down
26 changes: 23 additions & 3 deletions tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,10 +1945,30 @@ public function testGetWithFilter() {

public function testAppstoreDisabled() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->willReturn(false);
->will($this->returnCallback(function($var, $default) {
if ($var === 'appstoreenabled') {
return false;
}
return $default;
}));
$this->appData
->expects($this->never())
->method('getFolder');

$this->assertEquals([], $this->fetcher->get());
}


public function testNoInternet() {
$this->config
->method('getSystemValue')
->will($this->returnCallback(function($var, $default) {
if ($var === 'has_internet_connection') {
return false;
}
return $default;
}));
$this->appData
->expects($this->never())
->method('getFolder');
Expand Down
24 changes: 21 additions & 3 deletions tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,33 @@ public function setUp() {

public function testAppstoreDisabled() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->willReturn(false);
->will($this->returnCallback(function($var, $default) {
if ($var === 'appstoreenabled') {
return false;
}
return $default;
}));
$this->appData
->expects($this->never())
->method('getFolder');

$this->assertEquals([], $this->fetcher->get());
}

public function testNoInternet() {
$this->config
->method('getSystemValue')
->will($this->returnCallback(function($var, $default) {
if ($var === 'has_internet_connection') {
return false;
}
return $default;
}));
$this->appData
->expects($this->never())
->method('getFolder');

$this->assertEquals([], $this->fetcher->get());
}
}
26 changes: 23 additions & 3 deletions tests/lib/App/AppStore/Fetcher/FetcherBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ public function testGetWithAlreadyExistingFileAndUpToDateTimestampAndVersion() {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
Expand Down Expand Up @@ -121,11 +126,16 @@ public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion() {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('appstoreenabled', true)
->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with('appstoreenabled', true)
->willReturn(true);
$this->config
->expects($this->at(3))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
Expand Down Expand Up @@ -277,11 +287,16 @@ public function testGetWithAlreadyExistingFileAndNoVersion() {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('appstoreenabled', true)
->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with('appstoreenabled', true)
->willReturn(true);
$this->config
->expects($this->at(3))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
Expand Down Expand Up @@ -356,11 +371,16 @@ public function testGetWithAlreadyExistingFileAndOutdatedVersion() {
$this->config
->expects($this->at(1))
->method('getSystemValue')
->with('appstoreenabled', true)
->with('has_internet_connection', true)
->willReturn(true);
$this->config
->expects($this->at(2))
->method('getSystemValue')
->with('appstoreenabled', true)
->willReturn(true);
$this->config
->expects($this->at(3))
->method('getSystemValue')
->with(
$this->equalTo('version'),
$this->anything()
Expand Down