Use activity registration for the settings

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

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>

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');