From 71b0715058a9036f4aa86783d4c23871c5fbc2b6 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <eneiluj@gmx.fr>
Date: Fri, 17 Mar 2017 20:16:12 -0300
Subject: [PATCH] app is now compliant to occ check-code

---
 CHANGELOG.md                   |  1 +
 appinfo/application.php        | 20 ++++----------------
 controller/pagecontroller.php  |  6 +++---
 controller/utilscontroller.php |  7 ++++---
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59496d0..b6bb94e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 ### Fixed
+- app is now compliant to occ check-code
 
 ## 0.0.4 – 2017-01-17
 ### Added
diff --git a/appinfo/application.php b/appinfo/application.php
index 6e930fc..0eca37a 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -49,21 +49,8 @@ class Application extends App {
                     $c->query('UserId'),
                     $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
                     $c->query('ServerContainer')->getConfig(),
-                    $c->getServer()->getShareManager()
-                );
-            }
-        );
-
-        $container->registerService(
-            'ComparisonController', function (IAppContainer $c) {
-                return new ComparisonController(
-                    $c->query('AppName'),
-                    $c->query('Request'),
-                    $c->query('UserId'),
-                    //$c->getServer()->getUserFolder($c->query('UserId')),
-                    //$c->query('OCP\IConfig'),
-                    $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
-                    $c->query('ServerContainer')->getConfig()
+                    $c->getServer()->getShareManager(),
+                    $c->getServer()->getAppManager()
                 );
             }
         );
@@ -77,7 +64,8 @@ class Application extends App {
                     //$c->getServer()->getUserFolder($c->query('UserId')),
                     //$c->query('OCP\IConfig'),
                     $c->query('ServerContainer')->getUserFolder($c->query('UserId')),
-                    $c->query('ServerContainer')->getConfig()
+                    $c->query('ServerContainer')->getConfig(),
+                    $c->getServer()->getAppManager()
                 );
             }
         );
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index c9bc5fc..dac3e2a 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -11,7 +11,7 @@
 
 namespace OCA\GpxEdit\Controller;
 
-use \OC_App;
+use OCP\App\IAppManager;
 
 use OCP\IURLGenerator;
 use OCP\IConfig;
@@ -95,10 +95,10 @@ class PageController extends Controller {
     private $appPath;
 
     public function __construct($AppName, IRequest $request, $UserId,
-                                $userfolder, $config, $shareManager){
+                                $userfolder, $config, $shareManager, IAppManager $appManager){
         parent::__construct($AppName, $request);
         $this->appVersion = $config->getAppValue('gpxedit', 'installed_version');
-        $this->appPath = \OC_App::getAppPath('gpxedit');
+        $this->appPath = $appManager->getAppPath('gpxedit');
         $this->userId = $UserId;
         $this->dbtype = $config->getSystemValue('dbtype');
         // IConfig object
diff --git a/controller/utilscontroller.php b/controller/utilscontroller.php
index 45b4052..814648c 100644
--- a/controller/utilscontroller.php
+++ b/controller/utilscontroller.php
@@ -11,7 +11,7 @@
 
 namespace OCA\GpxEdit\Controller;
 
-use \OC_App;
+use OCP\App\IAppManager;
 
 use OCP\IURLGenerator;
 use OCP\IConfig;
@@ -85,10 +85,11 @@ class UtilsController extends Controller {
     private $appPath;
     //private $request;
 
-    public function __construct($AppName, IRequest $request, $UserId, $userfolder, $config){
+    public function __construct($AppName, IRequest $request, $UserId,
+        $userfolder, $config, IAppManager $appManager){
         parent::__construct($AppName, $request);
 		//$this->request = $request;
-        $this->appPath = \OC_App::getAppPath('gpxedit');
+        $this->appPath = $appManager->getAppPath('gpxedit');
         $this->userId = $UserId;
         $this->dbtype = $config->getSystemValue('dbtype');
         // IConfig object