From 0863663ef2bd488a14cc251e8d622f1aac439224 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 18 Mar 2024 18:52:39 +0800
Subject: [PATCH] Extract conversion of picked menu item in share type picker
 into NKShare ShareType into new method

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 .../FileProviderUIExt/ShareOptionsView.swift  | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareOptionsView.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareOptionsView.swift
index 7201bc564..a90cd3196 100644
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareOptionsView.swift
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/ShareOptionsView.swift
@@ -135,6 +135,27 @@ class ShareOptionsView: NSView {
         deleteButton.isEnabled = enabled
     }
 
+    func pickedShareType() -> NKShare.ShareType {
+        let selectedShareTypeItem = shareTypePicker.selectedItem
+        var selectedShareType = NKShare.ShareType.publicLink
+        if selectedShareTypeItem == publicLinkShareMenuItem {
+            selectedShareType = .publicLink
+        } else if selectedShareTypeItem == userShareMenuItem {
+            selectedShareType = .user
+        } else if selectedShareTypeItem == groupShareMenuItem {
+            selectedShareType = .group
+        } else if selectedShareTypeItem == emailShareMenuItem {
+            selectedShareType = .email
+        } else if selectedShareTypeItem == federatedCloudShareMenuItem {
+            selectedShareType = .federatedCloud
+        } else if selectedShareTypeItem == circleShare {
+            selectedShareType = .circle
+        } else if selectedShareTypeItem == talkConversationShare {
+            selectedShareType = .talkConversation
+        }
+        return selectedShareType
+    }
+
     @IBAction func passwordCheckboxAction(_ sender: Any) {
         passwordSecureField.isHidden = passwordProtectCheckbox.state == .off
     }
@@ -178,23 +199,7 @@ class ShareOptionsView: NSView {
                     return
                 }
 
-                let selectedShareTypeItem = shareTypePicker.selectedItem
-                var selectedShareType = NKShare.ShareType.publicLink
-                if selectedShareTypeItem == publicLinkShareMenuItem {
-                    selectedShareType = .publicLink
-                } else if selectedShareTypeItem == userShareMenuItem {
-                    selectedShareType = .user
-                } else if selectedShareTypeItem == groupShareMenuItem {
-                    selectedShareType = .group
-                } else if selectedShareTypeItem == emailShareMenuItem {
-                    selectedShareType = .email
-                } else if selectedShareTypeItem == federatedCloudShareMenuItem {
-                    selectedShareType = .federatedCloud
-                } else if selectedShareTypeItem == circleShare {
-                    selectedShareType = .circle
-                } else if selectedShareTypeItem == talkConversationShare {
-                    selectedShareType = .talkConversation
-                }
+                let selectedShareType = pickedShareType()
                 let shareWith = shareRecipientTextField.stringValue
 
                 var permissions = NKShare.PermissionValues.all.rawValue
-- 
2.30.2