wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable the remote sharing notifications until they work properly

Browse source
This commit is contained in:
Joas Schilling 2015-09-16 12:08:21 +02:00 committed by Thomas Müller
parent 9e1cd6d873
commit 6bc93c7401
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_sharing/api/server2server.php
View file

@ -83,6 +83,8 @@ class Server2Server {
Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(), Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(),
'', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW); '', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW);
/**
* FIXME
$urlGenerator = \OC::$server->getURLGenerator(); $urlGenerator = \OC::$server->getURLGenerator();
$notificationManager = \OC::$server->getNotificationManager(); $notificationManager = \OC::$server->getNotificationManager();
@ -104,6 +106,7 @@ class Server2Server {
$notification->addAction($acceptAction); $notification->addAction($acceptAction);
$notificationManager->notify($notification); $notificationManager->notify($notification);
*/
return new \OC_OCS_Result(); return new \OC_OCS_Result();
} catch (\Exception $e) { } catch (\Exception $e) {

3
apps/files_sharing/appinfo/app.php
View file

@ -113,9 +113,12 @@ if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
} }
} }
/**
* FIXME
$manager = \OC::$server->getNotificationManager(); $manager = \OC::$server->getNotificationManager();
$manager->registerNotifier(function() { $manager->registerNotifier(function() {
return new \OCA\Files_Sharing\Notifier( return new \OCA\Files_Sharing\Notifier(
\OC::$server->getL10NFactory() \OC::$server->getL10NFactory()
); );
}); });
*/

4
apps/files_sharing/lib/external/manager.php vendored
View file

@ -214,7 +214,7 @@ class Manager {
$acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid)); $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept'); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
$this->scrapNotification($share['remote_id']); //FIXME $this->scrapNotification($share['remote_id']);
return true; return true;
} }
@ -237,7 +237,7 @@ class Manager {
$removeShare->execute(array($id, $this->uid)); $removeShare->execute(array($id, $this->uid));
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
$this->scrapNotification($share['remote_id']); //FIXME $this->scrapNotification($share['remote_id']);
return true; return true;
} }