Merge pull request #2 from nextcloud/get-ready-for-release

small fixes for the Nextcloud 10 release

4 files changed, 5 insertions, 66 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
deleted file mode 100644
index a610dfc..0000000
--- a/appinfo/application.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <coding@schilljs.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Survey_Client\AppInfo;
-
-use OCA\Survey_Client\Controller\EndpointController;
-use OCA\Survey_Client\Collector;
-use OCP\AppFramework\App;
-use OCP\IContainer;
-
-class Application extends App {
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('survey_client', $urlParams);
-		$container = $this->getContainer();
-
-		$container->registerService('EndpointController', function(IContainer $c) {
-			/** @var \OC\Server $server */
-			$server = $c->query('ServerContainer');
-
-			return new EndpointController(
-				$c->query('AppName'),
-				$server->getRequest(),
-				$c->query('OCA\Survey_Client\Collector'),
-				$server->getJobList(),
-				$server->getNotificationManager()
-			);
-		});
-
-		$container->registerService('OCA\Survey_Client\Collector', function(IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-
-			return new Collector(
-				$server->getHTTPClientService(),
-				$server->getConfig(),
-				$server->getDatabaseConnection(),
-				$server->getIniWrapper(),
-				$server->getL10NFactory()->get('survey_client')
-			);
-		});
-
-		$container->registerCapability('Capabilities');
-	}
-}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9fea4b3..ad5cd40 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,6 +7,7 @@
         always have full control over he content send to Nextcloud and can disable
         it again at any time.
     </description>
+    <namespace>Survey_Client</namespace>
     <licence>AGPL</licence>
     <author>Joas Schilling, Björn Schiessle</author>
     <version>0.1.5</version>
diff --git a/appinfo/install.php b/appinfo/install.php
index 0608a2b..1020531 100644
--- a/appinfo/install.php
+++ b/appinfo/install.php
@@ -19,6 +19,6 @@
  *
  */
 
-if (!\OC::$server->getJobList()->has('OCA\Survey_Client\MonthlyReport', null)) {
-	\OC::$server->getJobList()->add('OCA\Survey_Client\AdminNotification');
+if (!\OC::$server->getJobList()->has('OCA\Survey_Client\BackgroundJobs\MonthlyReport', null)) {
+	\OC::$server->getJobList()->add('OCA\Survey_Client\BackgroundJobs\AdminNotification');
 }
diff --git a/appinfo/update.php b/appinfo/update.php
index 0608a2b..1020531 100644
--- a/appinfo/update.php
+++ b/appinfo/update.php
@@ -19,6 +19,6 @@
  *
  */
 
-if (!\OC::$server->getJobList()->has('OCA\Survey_Client\MonthlyReport', null)) {
-	\OC::$server->getJobList()->add('OCA\Survey_Client\AdminNotification');
+if (!\OC::$server->getJobList()->has('OCA\Survey_Client\BackgroundJobs\MonthlyReport', null)) {
+	\OC::$server->getJobList()->add('OCA\Survey_Client\BackgroundJobs\AdminNotification');
 }