fix(socialavatars): Fix HTTP client usage

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

7 files changed, 19 insertions, 13 deletions

diff --git a/lib/Service/Social/DiasporaProvider.php b/lib/Service/Social/DiasporaProvider.php
index 08076250..d729cf0f 100644
--- a/lib/Service/Social/DiasporaProvider.php
+++ b/lib/Service/Social/DiasporaProvider.php
@@ -23,10 +23,11 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class DiasporaProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var bool */
@@ -36,7 +37,7 @@ class DiasporaProvider implements ISocialProvider {
 	public $name = 'diaspora';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->looping = false;
 	}
 
diff --git a/lib/Service/Social/FacebookProvider.php b/lib/Service/Social/FacebookProvider.php
index 4ea79d87..9318ece8 100644
--- a/lib/Service/Social/FacebookProvider.php
+++ b/lib/Service/Social/FacebookProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class FacebookProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'facebook';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**
diff --git a/lib/Service/Social/InstagramProvider.php b/lib/Service/Social/InstagramProvider.php
index a61e36be..1b046f87 100644
--- a/lib/Service/Social/InstagramProvider.php
+++ b/lib/Service/Social/InstagramProvider.php
@@ -27,11 +27,12 @@ use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\RequestOptions;
 use OC\AppFramework\Http\Request;
 use OCA\Contacts\AppInfo\Application;
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use Psr\Log\LoggerInterface;
 
 class InstagramProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var LoggerInterface */
@@ -42,7 +43,7 @@ class InstagramProvider implements ISocialProvider {
 
 	public function __construct(IClientService $httpClient,
 								LoggerInterface $logger) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->logger = $logger;
 	}
 
diff --git a/lib/Service/Social/MastodonProvider.php b/lib/Service/Social/MastodonProvider.php
index fb7f5cf2..b4b71924 100644
--- a/lib/Service/Social/MastodonProvider.php
+++ b/lib/Service/Social/MastodonProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class MastodonProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'mastodon';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**
diff --git a/lib/Service/Social/TelegramProvider.php b/lib/Service/Social/TelegramProvider.php
index c17fc963..56bb6f50 100644
--- a/lib/Service/Social/TelegramProvider.php
+++ b/lib/Service/Social/TelegramProvider.php
@@ -26,11 +26,12 @@ namespace OCA\Contacts\Service\Social;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\RequestOptions;
 use OCA\Contacts\AppInfo\Application;
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use Psr\Log\LoggerInterface;
 
 class TelegramProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var LoggerInterface */
@@ -41,7 +42,7 @@ class TelegramProvider implements ISocialProvider {
 
 	public function __construct(IClientService $httpClient,
 								LoggerInterface $logger) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 		$this->logger = $logger;
 	}
 
diff --git a/lib/Service/Social/XingProvider.php b/lib/Service/Social/XingProvider.php
index 78443d56..b7fc6aa6 100644
--- a/lib/Service/Social/XingProvider.php
+++ b/lib/Service/Social/XingProvider.php
@@ -23,17 +23,18 @@
 
 namespace OCA\Contacts\Service\Social;
 
+use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 
 class XingProvider implements ISocialProvider {
-	/** @var IClientService */
+	/** @var IClient */
 	private $httpClient;
 
 	/** @var string */
 	public $name = 'xing';
 
 	public function __construct(IClientService $httpClient) {
-		$this->httpClient = $httpClient->NewClient();
+		$this->httpClient = $httpClient->newClient();
 	}
 
 	/**
diff --git a/lib/Service/SocialApiService.php b/lib/Service/SocialApiService.php
index ef0dfb83..1c6e4827 100644
--- a/lib/Service/SocialApiService.php
+++ b/lib/Service/SocialApiService.php
@@ -218,7 +218,7 @@ class SocialApiService {
 
 			foreach ($urls as $url) {
 				try {
-					$httpResult = $this->clientService->NewClient()->get($url);
+					$httpResult = $this->clientService->newClient()->get($url);
 					$socialdata = $httpResult->getBody();
 					$imageType = $httpResult->getHeader('content-type');
 					if (isset($socialdata) && isset($imageType)) {