Merge pull request #7121 from nextcloud/fix_7119

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

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

@@ -128,8 +128,9 @@ abstract class Fetcher {
 	 */
 	public function get() {
 		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+		$internetavailable = $this->config->getSystemValue('has_internet_connection', true);
 
-		if (!$appstoreenabled) {
+		if (!$appstoreenabled || !$internetavailable) {
 			return [];
 		}
 

tests/lib/App/AppStore/Fetcher/AppFetcherTest.php

@@ -1945,10 +1945,30 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
 
 	public function testAppstoreDisabled() {
 		$this->config
-			->expects($this->once())
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
+			->will($this->returnCallback(function($var, $default) {
-			->willReturn(false);
+				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');

tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php

@@ -40,15 +40,33 @@ class CategoryFetcherTest extends FetcherBase {
 
 	public function testAppstoreDisabled() {
 		$this->config
-			->expects($this->once())
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
+			->will($this->returnCallback(function($var, $default) {
-			->willReturn(false);
+				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());
 	}
 }

tests/lib/App/AppStore/Fetcher/FetcherBase.php

@@ -78,6 +78,11 @@ abstract class FetcherBase extends TestCase {
 		$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()
@@ -121,11 +126,16 @@ abstract class FetcherBase extends TestCase {
 		$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()
@@ -277,11 +287,16 @@ abstract class FetcherBase extends TestCase {
 		$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()
@@ -356,11 +371,16 @@ abstract class FetcherBase extends TestCase {
 		$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()