Merge pull request #186 from nextcloud/fixes

Some fixes

appinfo/info.xml

@@ -23,7 +23,7 @@
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-presentation.png</screenshot>
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-spreadsheet.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="12" max-version="13" />
+		<nextcloud min-version="12" max-version="14" />
 	</dependencies>
 	<settings>
 		<admin>OCA\Richdocuments\Settings\Admin</admin>

lib/AppInfo/Application.php

@@ -29,18 +29,5 @@ use OCP\AppFramework\IAppContainer;
 class Application extends App  {
 	public function __construct (array $urlParams = array()) {
 		parent::__construct('richdocuments', $urlParams);
-		$container = $this->getContainer();
-		$container->registerService(
-			DiscoveryManager::class,
-			function(IAppContainer $container) {
-				return new DiscoveryManager(
-					$container->getServer()->getHTTPClientService(),
-					$container->getServer()->getAppDataDir('richdocuments'),
-					$container->getServer()->getConfig(),
-					$container->getServer()->getL10N('richdocuments'),
-					new TimeFactory()
-				);
-			}
-		);
 	}
-}
+}

lib/Db/DbBase.php

@@ -9,13 +9,13 @@
  * later.
  */
 
-namespace OCA\Richdocuments;
+namespace OCA\Richdocuments\Db;
 
 /**
  * Generic DB class
  */
 
-abstract class Db {
+abstract class DbBase {
 
 	protected $data;
 

lib/Db/Wopi.php

@@ -11,10 +11,7 @@
 
 namespace OCA\Richdocuments\Db;
 
-use \OCA\Richdocuments\Download;
+class Wopi extends DbBase {
-use \OCA\Richdocuments\DownloadResponse;
-
-class Wopi extends \OCA\Richdocuments\Db{
 
 	const DB_TABLE = '`*PREFIX*richdocuments_wopi`';