mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Disable the remote sharing notifications until they work properly" 

This reverts commit 6bc93c7401.

Conflicts:
	apps/files_sharing/lib/external/manager.php
This commit is contained in:
Joas Schilling 2016-02-09 15:30:31 +01:00
parent 9ebcc4ce31
commit 3ff88c8c84
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -194,7 +194,7 @@ class Manager {
\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $share['remote']]);
//FIXME $this->scrapNotification($share['remote_id']);
$this->scrapNotification($share['remote_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');
//FIXME $this->scrapNotification($share['remote_id']);
$this->scrapNotification($share['remote_id']);
return true;
}