From 5067c7b87ff9e2b16ac88f48c7988cf89a982ff2 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 5 May 2022 21:29:03 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=20WIP:=20Add=20secure/unsecure=20o?= =?UTF-8?q?ption=20for=20proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpmon/Domain/DomainList/DomainListVC+Actions.swift | 13 +++++++++++++ .../DomainList/DomainListVC+ContextMenu.swift | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/phpmon/Domain/DomainList/DomainListVC+Actions.swift b/phpmon/Domain/DomainList/DomainListVC+Actions.swift index f271e417..f5da528e 100644 --- a/phpmon/Domain/DomainList/DomainListVC+Actions.swift +++ b/phpmon/Domain/DomainList/DomainListVC+Actions.swift @@ -12,6 +12,19 @@ import Cocoa extension DomainListVC { @objc func toggleSecure() { + if selected is ValetSite { + toggleSecureForSite() + } else { + toggleSecureForProxy() + } + } + + func toggleSecureForProxy() { + // TODO: Handle this correctly + print("Will secure or unsecure proxy") + } + + func toggleSecureForSite() { let rowToReload = tableView.selectedRow let originalSecureStatus = selectedSite!.secured let action = selectedSite!.secured ? "unsecure" : "secure" diff --git a/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift index 84f7888e..d0292f2c 100644 --- a/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift +++ b/phpmon/Domain/DomainList/DomainListVC+ContextMenu.swift @@ -43,7 +43,7 @@ extension DomainListVC { } addUnlink(to: menu, with: site) - addToggleSecure(to: menu, with: site) + addToggleSecure(to: menu, secured: site.secured) tableView.menu = menu } @@ -130,9 +130,9 @@ extension DomainListVC { } } - private func addToggleSecure(to menu: NSMenu, with site: ValetSite) { + private func addToggleSecure(to menu: NSMenu, secured: Bool) { menu.addItem( - withTitle: site.secured + withTitle: secured ? "domain_list.unsecure".localized : "domain_list.secure".localized, action: #selector(toggleSecure), @@ -146,6 +146,7 @@ extension DomainListVC { let menu = NSMenu() addOpenProxyInBrowser(to: menu) addSeparator(to: menu) + addToggleSecure(to: menu, secured: proxy.secured) addRemoveProxy(to: menu) tableView.menu = menu }