From fcc73a5770422fa7ee9c13191ed78e96460d6227 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 23 Apr 2025 21:26:14 -0700 Subject: [PATCH] Delete unused extension points code. --- ...sionPointEnableBasicWindowController.swift | 133 ------------------ ...tensionPointMarsEditWindowController.swift | 41 ------ 2 files changed, 174 deletions(-) delete mode 100644 Mac/Preferences/ExtensionPoints/ExtensionPointEnableBasicWindowController.swift delete mode 100644 Mac/Preferences/ExtensionPoints/ExtensionPointMarsEditWindowController.swift diff --git a/Mac/Preferences/ExtensionPoints/ExtensionPointEnableBasicWindowController.swift b/Mac/Preferences/ExtensionPoints/ExtensionPointEnableBasicWindowController.swift deleted file mode 100644 index 5354fa1cb..000000000 --- a/Mac/Preferences/ExtensionPoints/ExtensionPointEnableBasicWindowController.swift +++ /dev/null @@ -1,133 +0,0 @@ -// -// ExtensionPointEnableBasicWindowController.swift -// NetNewsWire -// -// Created by Maurice Parker on 4/8/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import Cocoa -import AuthenticationServices -import OAuthSwift -import Secrets - -class ExtensionPointEnableWindowController: NSWindowController { - - @IBOutlet weak var imageView: NSImageView! - @IBOutlet weak var titleLabel: NSTextField! - @IBOutlet weak var descriptionLabel: NSTextField! - - private weak var hostWindow: NSWindow? - - private let callbackURL = URL(string: "vincodennw://")! - private var oauth: OAuthSwift? - - var extensionPointType: ExtensionPoint.Type? - - convenience init() { - self.init(windowNibName: NSNib.Name("ExtensionPointEnableBasic")) - } - - override func windowDidLoad() { - super.windowDidLoad() - guard let extensionPointType = extensionPointType else { return } - - imageView.image = extensionPointType.templateImage - titleLabel.stringValue = extensionPointType.title - descriptionLabel.attributedStringValue = extensionPointType.description - } - - // MARK: API - - func runSheetOnWindow(_ hostWindow: NSWindow) { - self.hostWindow = hostWindow - hostWindow.beginSheet(window!) - } - - // MARK: Actions - - @IBAction func cancel(_ sender: Any) { - hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.cancel) - } - - @IBAction func enable(_ sender: Any) { - guard let extensionPointType = extensionPointType else { return } - - if let oauth1 = extensionPointType as? OAuth1SwiftProvider.Type { - enableOauth1(oauth1) - } else { - ExtensionPointManager.shared.activateExtensionPoint(extensionPointType) - hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.OK) - } - - } - -} - -extension ExtensionPointEnableWindowController: OAuthSwiftURLHandlerType { - - public func handle(_ url: URL) { - let session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURL.scheme, completionHandler: { (url, error) in - if let callbackedURL = url { - OAuth1Swift.handle(url: callbackedURL) - } - - guard let error = error else { return } - - self.oauth?.cancel() - self.oauth = nil - - if case ASWebAuthenticationSessionError.canceledLogin = error { - print("Login cancelled.") - } else { - NSApplication.shared.presentError(error) - } - }) - - session.presentationContextProvider = self - if !session.start() { - print("Session failed to start!!!") - } - - } -} - -extension ExtensionPointEnableWindowController: ASWebAuthenticationPresentationContextProviding { - - public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor { - return hostWindow! - } - -} - -private extension ExtensionPointEnableWindowController { - - func enableOauth1(_ provider: OAuth1SwiftProvider.Type) { - - let oauth1 = provider.oauth1Swift - self.oauth = oauth1 - oauth1.authorizeURLHandler = self - - oauth1.authorize(withCallbackURL: callbackURL) { [weak self] result in - guard let self = self else { return } - - switch result { - case .success(let tokenSuccess): - - // let token = tokenSuccess.credential.oauthToken - // let secret = tokenSuccess.credential.oauthTokenSecret - let screenName = tokenSuccess.parameters["screen_name"] as? String ?? "" - print("******************* \(screenName)") - self.hostWindow!.endSheet(self.window!, returnCode: NSApplication.ModalResponse.OK) - - case .failure(let oauthSwiftError): - NSApplication.shared.presentError(oauthSwiftError) - } - - self.oauth?.cancel() - self.oauth = nil - } - - } - -} diff --git a/Mac/Preferences/ExtensionPoints/ExtensionPointMarsEditWindowController.swift b/Mac/Preferences/ExtensionPoints/ExtensionPointMarsEditWindowController.swift deleted file mode 100644 index 91e3a729a..000000000 --- a/Mac/Preferences/ExtensionPoints/ExtensionPointMarsEditWindowController.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// ExtensionPointMarsEditWindowController.swift -// NetNewsWire -// -// Created by Maurice Parker on 4/8/20. -// Copyright © 2020 Ranchero Software. All rights reserved. -// - -import Cocoa - -class ExtensionPointEnableMarsEditWindowController: NSWindowController { - - private weak var hostWindow: NSWindow? - - convenience init() { - self.init(windowNibName: NSNib.Name("ExtensionPointMarsEdit")) - } - - override func windowDidLoad() { - super.windowDidLoad() - } - - // MARK: API - - func runSheetOnWindow(_ hostWindow: NSWindow) { - self.hostWindow = hostWindow - hostWindow.beginSheet(window!) - } - - // MARK: Actions - - @IBAction func cancel(_ sender: Any) { - hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.cancel) - } - - @IBAction func enable(_ sender: Any) { - ExtensionPointManager.shared.activateExtensionPoint(ExtensionPointIdentifer.marsEdit) - hostWindow!.endSheet(window!, returnCode: NSApplication.ModalResponse.OK) - } - -}