From 5162302aa81403e4c765e509a39787bec278de0d Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 21 Feb 2024 17:45:20 +0800
Subject: [PATCH] Properly add share custom action

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../DocumentActionViewController.swift              | 13 ++++---------
 .../FileProviderUIExt/Info.plist                    |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/DocumentActionViewController.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/DocumentActionViewController.swift
index 264b0fd56..98d2714b6 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/DocumentActionViewController.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/DocumentActionViewController.swift
@@ -25,16 +25,11 @@ class DocumentActionViewController: FPUIActionExtensionViewController {
         forAction actionIdentifier: String, itemIdentifiers: [NSFileProviderItemIdentifier]
     ) {
         Logger.actionViewController.info("Preparing for action: \(actionIdentifier)")
-        let shareViewController = ShareViewController()
-        addChild(shareViewController)
-        view.addSubview(shareViewController.view)
 
-        NSLayoutConstraint.activate([
-            view.leadingAnchor.constraint(equalTo: shareViewController.view.leadingAnchor),
-            view.trailingAnchor.constraint(equalTo: shareViewController.view.trailingAnchor),
-            view.topAnchor.constraint(equalTo: shareViewController.view.topAnchor),
-            view.bottomAnchor.constraint(equalTo: shareViewController.view.bottomAnchor)
-        ])
+        if actionIdentifier == "com.nextcloud.desktopclient.FileProviderUIExt.ShareAction" {
+            prepare(childViewController: ShareViewController())
+        }
+
     }
     
     override func prepare(forError error: Error) {
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
index 92d193b8b..f559d75c4 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Info.plist
@@ -10,9 +10,9 @@
 				<key>NSExtensionFileProviderActionActivationRule</key>
 				<string>TRUEPREDICATE</string>
 				<key>NSExtensionFileProviderActionIdentifier</key>
-				<string>com.mycompany.FileProviderUI.CustomAction</string>
+				<string>com.nextcloud.desktopclient.FileProviderUIExt.ShareAction</string>
 				<key>NSExtensionFileProviderActionName</key>
-				<string>Custom Action</string>
+				<string>Share options</string>
 			</dict>
 		</array>
 		<key>NSExtensionPrincipalClass</key>
-- 
2.30.2