From 1b2fc0e0340c0412dc75bc81648b29a0b8b7e8f5 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 30 Jul 2024 17:43:39 +0800
Subject: [PATCH] Add close action to lock view controller

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../FileProviderUIExt/Locking/LockViewController.swift    | 8 ++++++++
 .../FileProviderUIExt/Locking/LockViewController.xib      | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
index 03a7b184a..2d7b47357 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.swift
@@ -21,6 +21,10 @@ class LockViewController: NSViewController {
     @IBOutlet weak var closeButton: NSButton!
     @IBOutlet weak var loadingIndicator: NSProgressIndicator!
 
+    var actionViewController: DocumentActionViewController! {
+        return parent as? DocumentActionViewController
+    }
+
     init(_ itemIdentifiers: [NSFileProviderItemIdentifier], locking: Bool) {
         self.itemIdentifiers = itemIdentifiers
         self.locking = locking
@@ -30,4 +34,8 @@ class LockViewController: NSViewController {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    @IBAction func closeAction(_ sender: Any) {
+        actionViewController.extensionContext.completeRequest()
+    }
 }
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.xib b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.xib
index 61843b01c..0a583a09c 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.xib
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Locking/LockViewController.xib
@@ -80,6 +80,9 @@
                         <constraint firstAttribute="width" secondItem="7qN-mr-hAh" secondAttribute="height" multiplier="1:1" id="K00-Bi-dEy"/>
                         <constraint firstAttribute="width" constant="32" id="zVJ-h1-QXJ"/>
                     </constraints>
+                    <connections>
+                        <action selector="closeAction:" target="-2" id="E6h-U9-2eB"/>
+                    </connections>
                 </button>
             </subviews>
             <edgeInsets key="edgeInsets" left="10" right="10" top="10" bottom="10"/>
-- 
2.30.2