diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2017-08-29 20:33:31 +0300 |
---|---|---|
committer | Maxence Lange <maxence@artificial-owl.com> | 2017-08-29 20:33:31 +0300 |
commit | 6ba495be890da46ac0ff0c18883f37a8b86744dc (patch) | |
tree | 51a7de1469c7a1f2651f0ade619eafd983e172ab /lib | |
parent | ee89ff3ba1a1d130ba33c825050301cf1acaf67e (diff) |
SharesService -> SharingFrameService
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Api/v1/Circles.php | 4 | ||||
-rw-r--r-- | lib/AppInfo/Application.php | 2 | ||||
-rw-r--r-- | lib/Controller/BaseController.php | 12 | ||||
-rw-r--r-- | lib/Controller/FederatedController.php | 10 | ||||
-rw-r--r-- | lib/Controller/SharesController.php | 8 | ||||
-rw-r--r-- | lib/Service/BroadcastService.php | 2 | ||||
-rw-r--r-- | lib/Service/SharingFrameService.php (renamed from lib/Service/SharesService.php) | 4 |
7 files changed, 21 insertions, 21 deletions
diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php index 0ece8294..d43c068e 100644 --- a/lib/Api/v1/Circles.php +++ b/lib/Api/v1/Circles.php @@ -37,7 +37,7 @@ use OCA\Circles\Service\CirclesService; use OCA\Circles\Service\FederatedLinkService; use OCA\Circles\Service\MembersService; use OCA\Circles\Service\MiscService; -use OCA\Circles\Service\SharesService; +use OCA\Circles\Service\SharingFrameService; use OCP\Util; class Circles { @@ -349,7 +349,7 @@ class Circles { $frame = new SharingFrame((string)$source, (string)$type); $frame->setPayload($payload); - return $c->query(SharesService::class) + return $c->query(SharingFrameService::class) ->createFrame($circleUniqueId, $frame, (string)$broadcaster); } diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 7eb0b731..807f1d1c 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -48,7 +48,7 @@ use OCA\Circles\Service\MembersService; use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\MiscService; use OCA\Circles\Service\SearchService; -use OCA\Circles\Service\SharesService; +use OCA\Circles\Service\SharingFrameService; use OCP\AppFramework\App; use OCP\AppFramework\IAppContainer; use OCP\Util; diff --git a/lib/Controller/BaseController.php b/lib/Controller/BaseController.php index ca76f691..ba275fa6 100644 --- a/lib/Controller/BaseController.php +++ b/lib/Controller/BaseController.php @@ -36,7 +36,7 @@ use OCA\Circles\Service\MembersService; use OCA\Circles\Service\MiscService; use OCA\Circles\Service\SearchService; -use OCA\Circles\Service\SharesService; +use OCA\Circles\Service\SharingFrameService; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; use OCP\IL10N; @@ -65,8 +65,8 @@ class BaseController extends Controller { /** @var GroupsService */ protected $groupsService; - /** @var SharesService */ - protected $sharesService; + /** @var SharingFrameService */ + protected $sharingFrameService; /** @var BroadcastService */ protected $broadcastService; @@ -90,7 +90,7 @@ class BaseController extends Controller { * @param SearchService $searchService * @param MembersService $membersService * @param GroupsService $groupsService - * @param SharesService $sharesService + * @param SharingFrameService $sharingFrameService * @param BroadcastService $broadcastService * @param FederatedLinkService $federatedLinkService * @param MiscService $miscService @@ -105,7 +105,7 @@ class BaseController extends Controller { SearchService $searchService, MembersService $membersService, GroupsService $groupsService, - SharesService $sharesService, + SharingFrameService $sharingFrameService, BroadcastService $broadcastService, FederatedLinkService $federatedLinkService, MiscService $miscService @@ -119,7 +119,7 @@ class BaseController extends Controller { $this->searchService = $searchService; $this->membersService = $membersService; $this->groupsService = $groupsService; - $this->sharesService = $sharesService; + $this->sharingFrameService = $sharingFrameService; $this->broadcastService = $broadcastService; $this->federatedLinkService = $federatedLinkService; $this->miscService = $miscService; diff --git a/lib/Controller/FederatedController.php b/lib/Controller/FederatedController.php index 80660d72..13512086 100644 --- a/lib/Controller/FederatedController.php +++ b/lib/Controller/FederatedController.php @@ -39,7 +39,7 @@ use OCA\Circles\Service\ConfigService; use OCA\Circles\Service\FederatedLinkService; use OCA\Circles\Service\MembersService; use OCA\Circles\Service\MiscService; -use OCA\Circles\Service\SharesService; +use OCA\Circles\Service\SharingFrameService; use OCP\AppFramework\Http\DataResponse; use OCP\IL10N; @@ -60,8 +60,8 @@ class FederatedController extends BaseController { /** @var MembersService */ protected $membersService; - /** @var SharesService */ - protected $sharesService; + /** @var SharingFrameService */ + protected $sharingFrameService; /** @var FederatedLinkService */ protected $federatedLinkService; @@ -147,7 +147,7 @@ class FederatedController extends BaseController { try { Circles::compareVersion($apiVersion); $frame = SharingFrame::fromJSON($item); - $this->sharesService->receiveFrame($token, $uniqueId, $frame); + $this->sharingFrameService->receiveFrame($token, $uniqueId, $frame); } catch (SharingFrameAlreadyExistException $e) { return $this->federatedSuccess(); } catch (Exception $e) { @@ -156,7 +156,7 @@ class FederatedController extends BaseController { $this->miscService->asyncAndLeaveClientOutOfThis('done'); $this->broadcastService->broadcastFrame($frame); - $this->sharesService->forwardSharingFrame($frame); + $this->sharingFrameService->forwardSharingFrame($frame); exit(); } diff --git a/lib/Controller/SharesController.php b/lib/Controller/SharesController.php index 77615487..283c2dca 100644 --- a/lib/Controller/SharesController.php +++ b/lib/Controller/SharesController.php @@ -53,7 +53,7 @@ class SharesController extends BaseController { $share = new SharingFrame($source, $type); $share->setPayload($payload); - $this->sharesService->createFrame($circleUniqueId, $share); + $this->sharingFrameService->createFrame($circleUniqueId, $share); } catch (\Exception $e) { return $this->fail( [ @@ -101,7 +101,7 @@ class SharesController extends BaseController { public function initShareDelivery($circleId, $frameId) { try { - $frame = $this->sharesService->getFrameFromUniqueId($circleId, $frameId); + $frame = $this->sharingFrameService->getFrameFromUniqueId($circleId, $frameId); } catch (Exception $e) { return $this->fail($e->getMessage()); } @@ -112,9 +112,9 @@ class SharesController extends BaseController { $this->broadcastService->broadcastFrame($frame); // TODO - do not update cloudId to avoid duplicate, use it's own field and keep cloudId - $this->sharesService->updateFrameWithCloudId($frame); + $this->sharingFrameService->updateFrameWithCloudId($frame); if ($this->configService->isFederatedCirclesAllowed()) { - $this->sharesService->forwardSharingFrame($frame); + $this->sharingFrameService->forwardSharingFrame($frame); } exit(); diff --git a/lib/Service/BroadcastService.php b/lib/Service/BroadcastService.php index 03b1eb43..4020ce1d 100644 --- a/lib/Service/BroadcastService.php +++ b/lib/Service/BroadcastService.php @@ -56,7 +56,7 @@ class BroadcastService { /** - * SharesService constructor. + * BroadcastService constructor. * * @param string $userId * @param ConfigService $configService diff --git a/lib/Service/SharesService.php b/lib/Service/SharingFrameService.php index 9c6a5bc2..3cada6f6 100644 --- a/lib/Service/SharesService.php +++ b/lib/Service/SharingFrameService.php @@ -43,7 +43,7 @@ use OCA\Circles\Model\FederatedLink; use OCA\Circles\Model\SharingFrame; -class SharesService { +class SharingFrameService { /** @var string */ private $userId; @@ -68,7 +68,7 @@ class SharesService { /** - * SharesService constructor. + * SharingFrameService constructor. * * @param string $userId * @param ConfigService $configService |