From b68cb1fc0ce9cce0257bcc24d2d6dc41efba7367 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 31 Jan 2020 15:12:32 +0100
Subject: [PATCH] Use activity registration for the settings

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 apps/settings/appinfo/info.xml            | 17 +++++++++++++++++
 apps/settings/lib/AppInfo/Application.php |  9 ---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
index d77d8690b4..f2325c3afc 100644
--- a/apps/settings/appinfo/info.xml
+++ b/apps/settings/appinfo/info.xml
@@ -34,4 +34,21 @@
 		<personal-section>OCA\Settings\Sections\Personal\Security</personal-section>
 		<personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section>
 	</settings>
+
+	<activity>
+		<settings>
+			<setting>OCA\Settings\Activity\GroupSetting</setting>
+			<setting>OCA\Settings\Activity\SecuritySetting</setting>
+			<setting>OCA\Settings\Activity\Setting</setting>
+		</settings>
+		<filter>
+			<filter>OCA\Settings\Activity\SecurityFilter</filter>
+		</filter>
+		<providers>
+			<provider>OCA\Settings\Activity\GroupProvider</provider>
+			<provider>OCA\Settings\Activity\Provider</provider>
+			<provider>OCA\Settings\Activity\SecurityProvider</provider>
+		</providers>
+
+	</activity>
 </info>
diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php
index 4f7cbf6b1e..4d837500c4 100644
--- a/apps/settings/lib/AppInfo/Application.php
+++ b/apps/settings/lib/AppInfo/Application.php
@@ -149,15 +149,6 @@ class Application extends App {
 	}
 
 	public function register() {
-		$activityManager = $this->getContainer()->getServer()->getActivityManager();
-		$activityManager->registerSetting(Setting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(Provider::class); // FIXME move to info.xml
-		$activityManager->registerFilter(SecurityFilter::class); // FIXME move to info.xml
-		$activityManager->registerSetting(SecuritySetting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(SecurityProvider::class); // FIXME move to info.xml
-		$activityManager->registerSetting(GroupSetting::class); // FIXME move to info.xml
-		$activityManager->registerProvider(GroupProvider::class); // FIXME move to info.xml
-
 		Util::connectHook('OC_User', 'post_setPassword', $this, 'onChangePassword');
 		Util::connectHook('OC_User', 'changeUser', $this, 'onChangeInfo');