From 3ff88c8c84d887c36a5b6587c402bd627bcffdd6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 9 Feb 2016 15:30:31 +0100
Subject: [PATCH] Revert "Disable the remote sharing notifications until they
work properly"
This reverts commit 6bc93c740194d245bb9a7d1f230ed33461f842a7.
Conflicts:
apps/files_sharing/lib/external/manager.php
---
apps/files_sharing/api/server2server.php | 3 ---
apps/files_sharing/appinfo/app.php | 3 ---
apps/files_sharing/lib/external/manager.php | 4 ++--
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index e1195cb9573..f15169b74a2 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -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) {
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 7a418d179db..1d3d4b0f634 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -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()
);
});
- */
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index ea49348737f..0ced71aab2c 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']]);
- //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;
}
--
GitLab