Merge pull request #24380 from owncloud/move-activity-manager-to-namespace

Move activity manager to the namespace

2 files changed, 3 insertions, 4 deletions

diff --git a/lib/private/ActivityManager.php b/lib/private/Activity/Manager.php
index e522dca9e3b..e68802b2abb 100644
--- a/lib/private/ActivityManager.php
+++ b/lib/private/Activity/Manager.php
@@ -20,10 +20,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OC;
+namespace OC\Activity;
 
 
-use OC\Activity\Event;
 use OCP\Activity\IConsumer;
 use OCP\Activity\IEvent;
 use OCP\Activity\IExtension;
@@ -33,7 +32,7 @@ use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
 
-class ActivityManager implements IManager {
+class Manager implements IManager {
 	/** @var IRequest */
 	protected $request;
 
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 11cce494418..17cb7ee39cc 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -313,7 +313,7 @@ class Server extends ServerContainer implements IServerContainer {
 			);
 		});
 		$this->registerService('ActivityManager', function (Server $c) {
-			return new ActivityManager(
+			return new \OC\Activity\Manager(
 				$c->getRequest(),
 				$c->getUserSession(),
 				$c->getConfig()