From 844ef03a65074cf475064323de14b504cbca48d6 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 2 Aug 2020 14:10:02 -0500 Subject: [PATCH] Reenable Extensions for the 5.5 release --- Mac/MainWindow/SharingServicePickerDelegate.swift | 4 +--- Mac/Preferences/PreferencesWindowController.swift | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Mac/MainWindow/SharingServicePickerDelegate.swift b/Mac/MainWindow/SharingServicePickerDelegate.swift index 75d73e921..1a5349a42 100644 --- a/Mac/MainWindow/SharingServicePickerDelegate.swift +++ b/Mac/MainWindow/SharingServicePickerDelegate.swift @@ -26,9 +26,7 @@ import RSCore } static func customSharingServices(for items: [Any]) -> [NSSharingService] { - // MarsEdit and MicroBlog are hardcode only for the Mac 5.1 release - let hardCodedCommands: [SendToCommand] = [SendToMarsEditCommand(), SendToMicroBlogCommand()] - let customServices = hardCodedCommands.compactMap { (sendToCommand) -> NSSharingService? in + let customServices = ExtensionPointManager.shared.activeSendToCommands.compactMap { (sendToCommand) -> NSSharingService? in guard let object = items.first else { return nil diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index a1b0e9602..143425ce5 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/Mac/Preferences/PreferencesWindowController.swift @@ -40,9 +40,9 @@ class PreferencesWindowController : NSWindowController, NSToolbarDelegate { specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Accounts, name: NSLocalizedString("Accounts", comment: "Preferences"), image: NSImage(named: NSImage.userAccountsName))] -// specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Extensions, -// name: NSLocalizedString("Extensions", comment: "Preferences"), -// image: AppAssets.extensionPreference)] + specs += [PreferencesToolbarItemSpec(identifierRawValue: ToolbarItemIdentifier.Extensions, + name: NSLocalizedString("Extensions", comment: "Preferences"), + image: AppAssets.extensionPreference)] // Omit the Advanced Preferences for now because the Software Update related functionality is // forbidden/non-applicable, and we can rely upon Apple to some extent for crash reports. We