Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/circles.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/Api
diff options
context:
space:
mode:
authorMaxence Lange <maxence@nextcloud.com>2017-07-24 11:25:02 +0300
committerMaxence Lange <maxence@nextcloud.com>2017-07-24 11:25:02 +0300
commitc027b758d237b4fbb6380cf04902c641e83a1766 (patch)
tree3688e5e70d1069ac65ed1afd55023f211e0963be /lib/Api
parent3f30b63347efe08feec8fff26c48184e56ebea03 (diff)
switching circleId (int) to circleUniqueId (string)
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Diffstat (limited to 'lib/Api')
-rw-r--r--lib/Api/Sharees.php2
-rw-r--r--lib/Api/v1/Circles.php12
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Api/Sharees.php b/lib/Api/Sharees.php
index 4360905f..940ca5c4 100644
--- a/lib/Api/Sharees.php
+++ b/lib/Api/Sharees.php
@@ -81,7 +81,7 @@ class Sharees {
'label' => $entry->getName(),
'value' => [
'shareType' => Share::SHARE_TYPE_CIRCLE,
- 'shareWith' => $entry->getId(),
+ 'shareWith' => $entry->getUniqueId(),
'circleInfo' => $entry->getInfo(),
'circleOwner' => \OC::$server->getUserManager()
->get(
diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php
index 85618aa4..3421865b 100644
--- a/lib/Api/v1/Circles.php
+++ b/lib/Api/v1/Circles.php
@@ -295,7 +295,7 @@ class Circles {
* Source is the app that is sharing the item and type can be used by the app to identified the
* payload.
*
- * @param $circleId
+ * @param string $circleUniqueId
* @param $source
* @param $type
* @param array $payload
@@ -304,12 +304,12 @@ class Circles {
* @return mixed
*/
public static function shareToCircle(
- $circleId, $source, $type, array $payload, $broadcaster
+ $circleUniqueId, $source, $type, array $payload, $broadcaster
) {
$c = self::getContainer();
$frame = new SharingFrame((string)$source, (string)$type);
- $frame->setCircleId((int)$circleId);
+ $frame->setCircleId($circleUniqueId);
$frame->setPayload($payload);
return $c->query('SharesService')
@@ -342,13 +342,13 @@ class Circles {
*
* Returns the link to get access to a local circle.
*
- * @param int $circleId
+ * @param string $circleUniqueId
*
* @return string
*/
- public static function generateLink($circleId) {
+ public static function generateLink($circleUniqueId) {
return \OC::$server->getURLGenerator()
- ->linkToRoute('circles.Navigation.navigate') . '#' . $circleId;
+ ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
}