From d59f408db8b7da5ea8136df4b21b7ff5f9f73cfa Mon Sep 17 00:00:00 2001 From: Davide Date: Sun, 3 Nov 2024 16:57:40 +0100 Subject: [PATCH] Reword "Connect" to "Select" in server selector Does not reconnect if connection is inactive. Regression in fff21c3250dfdc6dfa2947ad7ecd15f49a371408 --- .../Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift | 1 - .../AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift | 1 - .../AppUIMain/Views/Provider/VPNProviderServerView.swift | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift index c523a792..23f9ded9 100644 --- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift +++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift @@ -220,7 +220,6 @@ private extension OpenVPNView { configurationType: OpenVPN.Configuration.self, selectedEntity: providerEntity.wrappedValue, filtersWithSelection: true, - selectTitle: Strings.Providers.selectEntity, onSelect: onSelectServer ) } diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift index 85ecb63b..ce444f01 100644 --- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift +++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerCoordinator.swift @@ -51,7 +51,6 @@ struct VPNProviderServerCoordinator: View where Configuration: Pr configurationType: Configuration.self, selectedEntity: selectedEntity, filtersWithSelection: false, - selectTitle: Strings.Global.connect, onSelect: onSelect ) .toolbar { diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift index 2a44f5d8..0ea30e9c 100644 --- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift +++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift @@ -42,7 +42,7 @@ struct VPNProviderServerView: View where Configuration: ProviderC let filtersWithSelection: Bool - let selectTitle: String + var selectTitle = Strings.Providers.selectEntity let onSelect: (VPNServer, VPNPreset) -> Void