mirror of
https://github.com/passepartoutvpn/passepartout-apple.git
synced 2024-12-24 02:21:00 +00:00
0a1886fe31
Let the AppCoordinator take care of the connection requirements via modals: - onInteractiveLogin() - now presented on AppError - onProviderEntityRequired() - onPurchaseRequired() - Any other connection error Subviews must not use tunnel.connect(), rather they route connection requests via the ConnectionFlow callbacks. In particular, migrate to the AppCoordinator the connection logic from: - TunnelToggleButton.perform() - ProviderEntitySelector.onSelect() onInteractiveLogin() and onPurchaseRequired() are now handled internally, while onProviderEntityRequired() is kept public because it's how subviews may present the entity selector. Extras: - Avoid modals overlap with a 500ms delay - Shrink interactive login size on macOS
61 lines
1.6 KiB
Swift
61 lines
1.6 KiB
Swift
//
|
|
// TunnelRestartButton.swift
|
|
// Passepartout
|
|
//
|
|
// Created by Davide De Rosa on 9/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 CommonLibrary
|
|
import CommonUtils
|
|
import PassepartoutKit
|
|
import SwiftUI
|
|
|
|
struct TunnelRestartButton<Label>: View where Label: View {
|
|
|
|
@ObservedObject
|
|
var tunnel: ExtendedTunnel
|
|
|
|
let profile: Profile?
|
|
|
|
let errorHandler: ErrorHandler
|
|
|
|
var flow: ConnectionFlow?
|
|
|
|
let label: () -> Label
|
|
|
|
var body: some View {
|
|
Button {
|
|
guard let profile else {
|
|
return
|
|
}
|
|
guard tunnel.status == .active else {
|
|
return
|
|
}
|
|
Task {
|
|
await flow?.onConnect(profile)
|
|
}
|
|
} label: {
|
|
label()
|
|
}
|
|
.disabled(profile == nil || tunnel.status != .active)
|
|
}
|
|
}
|