mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-24 02:21:00 +00:00
14398f5f20
First, rename `force` parameter of ProfileManager.save() to `isLocal`, because it's meant to be used when saving local profiles. In such scenario, a profile that is also remotely shared _must_ be re-saved to the remote repository. This was not being done when selecting a provider server, and it could be noticed because the other devices would only receive the iCloud update after editing the profile and re-doing a manual "Save". Only at that point would the new profile be re-shared on iCloud.
85 lines
2.5 KiB
Swift
85 lines
2.5 KiB
Swift
//
|
|
// ProviderEntitySelector.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 10/22/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 CommonLibrary
|
|
import CommonUtils
|
|
import PassepartoutKit
|
|
import SwiftUI
|
|
|
|
struct ProviderEntitySelector: View {
|
|
|
|
@ObservedObject
|
|
var profileManager: ProfileManager
|
|
|
|
@ObservedObject
|
|
var tunnel: ExtendedTunnel
|
|
|
|
let profile: Profile
|
|
|
|
let module: Module
|
|
|
|
let provider: SerializedProvider
|
|
|
|
let errorHandler: ErrorHandler
|
|
|
|
var body: some View {
|
|
if let viewProvider = module as? any ProviderEntityViewProviding {
|
|
AnyView(viewProvider.providerEntityView(
|
|
with: provider,
|
|
errorHandler: errorHandler,
|
|
onSelect: onSelect
|
|
))
|
|
} else {
|
|
fatalError("Module got too far without being ProviderEntityViewProviding: \(module)")
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension ProviderEntitySelector {
|
|
func onSelect(_ entity: any ProviderEntity & Encodable) async throws {
|
|
pp_log(.app, .info, "Select new provider entity: \(entity)")
|
|
|
|
do {
|
|
guard var moduleBuilder = module.providerModuleBuilder() else {
|
|
assertionFailure("Module is not a ProviderModuleBuilder?")
|
|
return
|
|
}
|
|
try moduleBuilder.setProviderEntity(entity)
|
|
let newModule = try moduleBuilder.tryBuild()
|
|
|
|
var builder = profile.builder()
|
|
builder.saveModule(newModule)
|
|
let newProfile = try builder.tryBuild()
|
|
|
|
try await profileManager.save(newProfile, isLocal: true)
|
|
|
|
// will reconnect via AppContext observation
|
|
} catch {
|
|
pp_log(.app, .error, "Unable to save new provider entity: \(error)")
|
|
throw error
|
|
}
|
|
}
|
|
}
|