Avoid Nextcloud from failing if files_external is disabled

NastuzziSamy · Mar 12, 2019 · b05bf4b · b05bf4b
1 parent ca5386d
commit b05bf4b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -19,8 +19,11 @@
  *
  */
 
-if ((@include_once(dirname(__DIR__).'/vendor/autoload.php')) === false)
-     throw new \Exception('Cannot include autoload. Did you run install dependencies using composer?');
+if ((@include_once(dirname(__DIR__).'/vendor/autoload.php')) === false) {
+    throw new \Exception('Cannot include autoload. Did you install dependencies using composer?');
+}
 
-$app = new \OCA\Files_external_gdrive\AppInfo\Application();
-$app->register();
+if (\OC::$server->getAppManager()->isEnabledForUser('files_external')) {
+    $app = new \OCA\Files_external_gdrive\AppInfo\Application();
+    $app->register();
+}
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -20,9 +20,11 @@
  *
  */
 
-$application = new \OCA\Files_external_gdrive\AppInfo\Application();
-$application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'oauth#receiveToken', 'url' => '/oauth', 'verb' => 'POST'],
-	],
-]);
+if (\OC::$server->getAppManager()->isEnabledForUser('files_external')) {
+    $application = new \OCA\Files_external_gdrive\AppInfo\Application();
+    $application->registerRoutes($this, [
+    	'routes' => [
+    		['name' => 'oauth#receiveToken', 'url' => '/oauth', 'verb' => 'POST'],
+    	],
+    ]);
+}