passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-02-22 15:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not connect TV profile on server selection (#1030)

Browse Source 
You may still connect manually, but iOS/macOS apps mainly serve as
remote to switch servers on the TV.
This commit is contained in:
Davide 2024-12-20 10:30:57 +01:00 committed by GitHub
parent f8e623e1fe
commit 42bf392fff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
View File

@ -191,6 +191,7 @@ extension AppCoordinator {
ProviderEntitySelector(
module: module,
errorHandler: errorHandler,
selectTitle: profile.providerServerSelectionTitle,
onSelect: {
try await onSelectProviderEntity(with: $0, in: profile, force: force)
}
@ -270,6 +271,11 @@ private extension AppCoordinator {
let wasConnected = newProfile.id == tunnel.currentProfile?.id && tunnel.status == .active
try await profileManager.save(newProfile, isLocal: true)
guard profile.shouldConnectToProviderServer else {
return
}
if !wasConnected {
pp_log(.app, .info, "Profile \(newProfile.id) was not connected, will connect to new provider entity")
await onConnect(newProfile, force: force)
@ -313,6 +319,21 @@ private extension AppCoordinator {
}
}
private extension Profile {
var providerServerSelectionTitle: String {
attributes.isAvailableForTV == true ? Strings.Views.Providers.selectEntity : Strings.Global.Actions.connect
}
var shouldConnectToProviderServer: Bool {
#if os(tvOS)
true
#else
// do not connect TV profiles on server selection
attributes.isAvailableForTV != true
#endif
}
}
// MARK: - Previews
#Preview {

13
Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
View File

@ -88,14 +88,14 @@ private extension ProfileContextMenu {
}
var providerConnectToButton: some View {
profile.map {
profile.map { profile in
ProviderConnectToButton(
profile: $0,
profile: profile,
onTap: {
flow?.connectionFlow?.onProviderEntityRequired($0)
},
label: {
ThemeImageLabel(Strings.Views.App.ProfileContext.connectTo.withTrailingDots, .profileProvider)
ThemeImageLabel(profile.providerServerSelectionTitle, .profileProvider)
}
)
.uiAccessibility(.App.ProfileMenu.connectTo)
@ -143,6 +143,13 @@ private extension ProfileContextMenu {
}
}
private extension Profile {
var providerServerSelectionTitle: String {
(attributes.isAvailableForTV == true ?
Strings.Views.Providers.selectEntity : Strings.Views.App.ProfileContext.connectTo).withTrailingDots
}
}
#Preview {
List {
Menu("Menu") {

2
Library/Sources/AppUIMain/Views/Modules/Extensions/OpenVPNModule+Extensions.swift
View File

@ -37,6 +37,7 @@ extension OpenVPNModule.Builder: ModuleViewProviding {
extension OpenVPNModule: ProviderEntityViewProviding {
public func providerEntityView(
errorHandler: ErrorHandler,
selectTitle: String,
onSelect: @escaping (Module) async throws -> Void
) -> some View {
providerSelection.map {
@ -44,6 +45,7 @@ extension OpenVPNModule: ProviderEntityViewProviding {
moduleId: id,
providerId: $0.id,
selectedEntity: $0.entity,
selectTitle: selectTitle,
onSelect: {
var newBuilder = builder()
newBuilder.providerEntity = $0

2
Library/Sources/AppUIMain/Views/Modules/Extensions/WireGuardModule+Extensions.swift
View File

@ -37,6 +37,7 @@ extension WireGuardModule.Builder: ModuleViewProviding {
extension WireGuardModule: ProviderEntityViewProviding {
public func providerEntityView(
errorHandler: ErrorHandler,
selectTitle: String,
onSelect: @escaping (Module) async throws -> Void
) -> some View {
providerSelection.map {
@ -44,6 +45,7 @@ extension WireGuardModule: ProviderEntityViewProviding {
moduleId: id,
providerId: $0.id,
selectedEntity: $0.entity,
selectTitle: selectTitle,
onSelect: {
var newBuilder = builder()
newBuilder.providerEntity = $0

3
Library/Sources/AppUIMain/Views/Providers/ProviderEntitySelector.swift
View File

@ -33,12 +33,15 @@ struct ProviderEntitySelector: View {
let errorHandler: ErrorHandler
let selectTitle: String
let onSelect: (Module) async throws -> Void
var body: some View {
if let viewProvider = module as? any ProviderEntityViewProviding {
AnyView(viewProvider.providerEntityView(
errorHandler: errorHandler,
selectTitle: selectTitle,
onSelect: onSelect
))
} else {

4
Library/Sources/AppUIMain/Views/VPN/VPNProviderServerCoordinator.swift
View File

@ -38,6 +38,8 @@ struct VPNProviderServerCoordinator<Configuration>: View where Configuration: Id
let selectedEntity: VPNEntity<Configuration>?
let selectTitle: String
let onSelect: (VPNEntity<Configuration>) async throws -> Void
@ObservedObject
@ -49,7 +51,7 @@ struct VPNProviderServerCoordinator<Configuration>: View where Configuration: Id
providerId: providerId,
selectedEntity: selectedEntity,
filtersWithSelection: false,
selectTitle: Strings.Global.Actions.connect,
selectTitle: selectTitle,
onSelect: onSelect
)
.themeNavigationStack(closable: true)

1
Library/Sources/UILibrary/Strategy/ProviderEntityViewProviding.swift
View File

@ -33,6 +33,7 @@ public protocol ProviderEntityViewProviding {
@MainActor
func providerEntityView(
errorHandler: ErrorHandler,
selectTitle: String,
onSelect: @escaping (Module) async throws -> Void
) -> EntityContent
}