mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-25 02:42:40 +00:00
fae0200995
Exclude endpoints from OpenVPN modules and providers with the generic Blacklist<T> observable. Eventually, rebuild the Profile in PacketTunnelProvider (via DefaultTunnelProcessor) with the applied exclusions from preferences. Revisit approach to preferences: - Module preferences - Tied to the module and therefore to the parent profile - Load/save in ProfileEditor on request (rather than on ProfileEditor.load) - Provider preferences - Shared globally across profiles - Load/save in module view if needed For more consistency with Core Data: - Revert to observables for both module and provider preferences - Treat excluded endpoints as relationships rather than a serialized Array - Add/remove single relationships over bulk delete + re-add - Do not map the relationships, Blacklist only needs exists/add/remove: - isExcludedEndpoint - addExcludedEndpoint - removeExcludedEndpoint Some clean-up: - Move the importer logic to OpenVPNView.ImportModifier - Move the preview data to OpenVPN.Configuration.Builder.forPreviews - Drop objectWillChange.send() on .repository didSet to avoid potential recursion during SwiftUI updates Closes #971
116 lines
3.4 KiB
Swift
116 lines
3.4 KiB
Swift
//
|
|
// VPNProviderContentModifier.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 10/7/24.
|
|
// Copyright (c) 2024 Davide De Rosa. All rights reserved.
|
|
//
|
|
// https://github.com/passepartoutvpn
|
|
//
|
|
// This file is part of Passepartout.
|
|
//
|
|
// Passepartout is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Passepartout is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
import CommonAPI
|
|
import CommonLibrary
|
|
import PassepartoutKit
|
|
import SwiftUI
|
|
|
|
struct VPNProviderContentModifier<Configuration, ProviderRows>: ViewModifier where Configuration: IdentifiableConfiguration, ProviderRows: View {
|
|
var apis: [APIMapper] = API.shared
|
|
|
|
@Binding
|
|
var providerId: ProviderID?
|
|
|
|
let providerPreferences: ProviderPreferences?
|
|
|
|
@Binding
|
|
var selectedEntity: VPNEntity<Configuration>?
|
|
|
|
@Binding
|
|
var paywallReason: PaywallReason?
|
|
|
|
let entityDestination: any Hashable
|
|
|
|
@ViewBuilder
|
|
let providerRows: ProviderRows
|
|
|
|
func body(content: Content) -> some View {
|
|
debugChanges()
|
|
return content
|
|
.modifier(ProviderContentModifier(
|
|
apis: apis,
|
|
providerId: $providerId,
|
|
providerPreferences: providerPreferences,
|
|
entityType: VPNEntity<Configuration>.self,
|
|
paywallReason: $paywallReason,
|
|
providerRows: {
|
|
providerEntityRow
|
|
providerRows
|
|
},
|
|
onSelectProvider: onSelectProvider
|
|
))
|
|
}
|
|
}
|
|
|
|
private extension VPNProviderContentModifier {
|
|
var providerEntityRow: some View {
|
|
NavigationLink(value: entityDestination) {
|
|
HStack {
|
|
Text(Strings.Global.Nouns.server)
|
|
if let selectedEntity {
|
|
Spacer()
|
|
Text(selectedEntity.server.hostname ?? selectedEntity.server.serverId)
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension VPNProviderContentModifier {
|
|
func onSelectProvider(manager: ProviderManager, providerId: ProviderID?, isInitial: Bool) {
|
|
if !isInitial {
|
|
selectedEntity = nil
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Preview
|
|
|
|
#Preview {
|
|
NavigationStack {
|
|
List {
|
|
EmptyView()
|
|
.modifier(VPNProviderContentModifier(
|
|
apis: [API.bundled],
|
|
providerId: .constant(.hideme),
|
|
providerPreferences: nil,
|
|
selectedEntity: .constant(nil as VPNEntity<OpenVPN.Configuration>?),
|
|
paywallReason: .constant(nil),
|
|
entityDestination: "Destination",
|
|
providerRows: {
|
|
Text("Other")
|
|
}
|
|
))
|
|
}
|
|
.navigationTitle("Preview")
|
|
.navigationDestination(for: String.self) {
|
|
Text($0)
|
|
}
|
|
}
|
|
.withMockEnvironment()
|
|
}
|