From c769f5775d7356211ca461489ae7c19a0f47cf03 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Feb 2016 16:33:17 +0100 Subject: [PATCH] Create the actions with the correct ID --- apps/files_sharing/api/server2server.php | 7 ++++--- apps/files_sharing/lib/external/manager.php | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index e308c54c11..7e0505ae04 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -81,6 +81,7 @@ class Server2Server { try { $externalManager->addShare($remote, $token, '', $name, $owner, false, $shareWith, $remoteId); + $shareId = \OC::$server->getDatabaseConnection()->lastInsertId('`*PREFIX*share_external`'); $user = $owner . '@' . $this->cleanupRemote($remote); @@ -95,17 +96,17 @@ class Server2Server { $notification->setApp('files_sharing') ->setUser($shareWith) ->setDateTime(new \DateTime()) - ->setObject('remote_share', $remoteId) + ->setObject('remote_share', $shareId) ->setSubject('remote_share', [$user, trim($name, '/')]); $declineAction = $notification->createAction(); $declineAction->setLabel('decline') - ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $remoteId), 'DELETE'); + ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId), 'DELETE'); $notification->addAction($declineAction); $acceptAction = $notification->createAction(); $acceptAction->setLabel('accept') - ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $remoteId), 'POST'); + ->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId), 'POST'); $notification->addAction($acceptAction); $notificationManager->notify($notification); diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index 0ced71aab2..21729d326e 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -194,7 +194,7 @@ class Manager { \OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $share['remote']]); - $this->scrapNotification($share['remote_id']); + $this->scrapNotification($id); return true; } @@ -217,7 +217,7 @@ class Manager { $removeShare->execute(array($id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); - $this->scrapNotification($share['remote_id']); + $this->scrapNotification($id); return true; }