Use activity registration for the settings

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

diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
index d77d8690b4468fb44a083e82e360426374a659da..f2325c3afca73f89c9e30ca11f68f0f6113b876c 100644 (file)
--- 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 4f7cbf6b1ee3fc80ec0b31c2a500ccc93a5fc71c..4d837500c4ccac15fae54f6b2a067e558ce963ce 100644 (file)
--- 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');