Fix app init & initialstate

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

2 files changed, 29 insertions, 35 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index 3ad6cea1..f9e8863b 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,41 +1,27 @@
 <?php
 /**
- * Nextcloud - contacts
+ * @copyright Copyright (c) 2020 John Molakvoæ <skjnldsv@protonmail.com>
  *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * @author Hendrik Leppelsack <hendrik@leppelsack.de>
- * @copyright Hendrik Leppelsack 2015
  */
 
-namespace OCA\Contacts\AppInfo;
-
-use OCP\AppFramework\App;
-
-$app = new App('contacts');
-$container = $app->getContainer();
-
-$container->query('OCP\INavigationManager')->add(function () use ($container) {
-	$urlGenerator = $container->query('OCP\IURLGenerator');
-	$l10n = $container->query('OCP\IL10N');
-	return [
-		// the string under which your app will be referenced in Nextcloud
-		'id' => 'contacts',
-
-		// sorting weight for the navigation. The higher the number, the higher
-		// will it be listed in the navigation
-		'order' => 4,
-
-		// the route that will be shown on startup
-		'href' => $urlGenerator->linkToRoute('contacts.page.index'),
-
-		// the icon that will be shown in the navigation
-		// this file needs to exist in img/
-		'icon' => $urlGenerator->imagePath('contacts', 'app.svg'),
+use OCA\Contacts\AppInfo\Application;
 
-		// the title of your application. This will be used in the
-		// navigation or on the settings page of your app
-		'name' => $l10n->t('Contacts'),
-	];
-});
+$app = \OC::$server->query(Application::class);
+$app->register();
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 15e2b9a8..3be7b1d9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,25 +11,33 @@
 * 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!
 * 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.
 	</description>
+
 	<version>3.3.0</version>
 	<licence>agpl</licence>
+
 	<author>John Molakvoæ</author>
 	<author>Team Popcorn</author>
+
 	<documentation>
 		<user>https://docs.nextcloud.com/server/stable/user_manual/pim/contacts.html</user>
 		<admin>https://docs.nextcloud.com/server/stable/admin_manual/configuration_server/occ_command.html?highlight=occ%20commands#dav-label</admin>
 		<developer>https://github.com/nextcloud/contacts#build-the-app</developer>
 	</documentation>
+	<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
+
 	<category>office</category>
 	<category>social</category>
 	<category>organization</category>
+
 	<website>https://github.com/nextcloud/contacts#readme</website>
 	<bugs>https://github.com/nextcloud/contacts/issues</bugs>
 	<repository type="git">https://github.com/nextcloud/contacts.git</repository>
-	<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
+
+
 	<dependencies>
 		<nextcloud min-version="17" max-version="19" />
 	</dependencies>
+
 	<contactsmenu>
 		<provider>OCA\Contacts\ContactsMenu\Providers\DetailsProvider</provider>
 	</contactsmenu>