Merge pull request #1688 from nextcloud/enh/import-vcf-from-files

nextcloud · Aug 21, 2020 · 8de4401 · 8de4401
2 parents 4291725 + f8a5d29
commit 8de4401
Show file tree

Hide file tree

Showing 27 changed files with 1,182 additions and 1,169 deletions.
diff --git a/img/app.png b/img/app.png
diff --git a/img/contacts.svg b/img/contacts.svg
diff --git a/img/favicon-mask.svg b/img/favicon-mask.svg
diff --git a/img/favicon-touch.png b/img/favicon-touch.png
diff --git a/img/favicon-touch.svg b/img/favicon-touch.svg
diff --git a/img/favicon.ico b/img/favicon.ico
diff --git a/img/favicon.png b/img/favicon.png
diff --git a/img/favicon.svg b/img/favicon.svg
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -23,6 +23,8 @@
 namespace OCA\Contacts\AppInfo;
 
 use OCA\Contacts\Dav\PatchPlugin;
+use OCA\Contacts\Listener\LoadContactsFilesActions;
+use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\AppFramework\App;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\SabrePluginEvent;
@@ -53,5 +55,8 @@ public function register() {
 				$server->addPlugin($this->getContainer()->query(PatchPlugin::class));
 			}
 		});
+
+		// Register files action
+		$eventDispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadContactsFilesActions::class);
 	}
 }
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -102,7 +102,7 @@ public function index(): TemplateResponse {
 		$this->initialStateService->provideInitialState(Application::APP_ID, 'enableSocialSync', $bgSyncEnabledByUser);
 		$this->initialStateService->provideInitialState(Application::APP_ID, 'contactsinteraction', $this->appManager->isEnabledForUser('contactsinteraction') === true);
 
-		Util::addScript(Application::APP_ID, 'contacts');
+		Util::addScript(Application::APP_ID, 'contacts-main');
 		Util::addStyle(Application::APP_ID, 'contacts');
 
 		return new TemplateResponse(Application::APP_ID, 'main');

diff --git a/lib/Dav/PatchPlugin.php b/lib/Dav/PatchPlugin.php
@@ -34,7 +34,6 @@
 use Sabre\DAV\ServerPlugin;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Reader;
 
 class PatchPlugin extends ServerPlugin {

diff --git a/lib/Listener/LoadContactsFilesActions.php b/lib/Listener/LoadContactsFilesActions.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2020, John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @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/>.
+ *
+ */
+
+namespace OCA\Contacts\Listener;
+
+use OCA\Contacts\AppInfo\Application;
+use OCA\Files\Event\LoadAdditionalScriptsEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Util;
+
+class LoadContactsFilesActions implements IEventListener {
+	public function handle(Event $event): void {
+		if (!($event instanceof LoadAdditionalScriptsEvent)) {
+			return;
+		}
+
+		Util::addStyle(Application::APP_ID, 'icons');
+		Util::addScript(Application::APP_ID, 'contacts-files-action');
+	}
+}