ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed SetTunnelStatus

Browse Source 
Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>
This commit is contained in:
Alessio Nossa
2023-04-01 16:00:24 +02:00
parent c29787f898
commit 63c09565f2
7 changed files with 4 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/WireGuardApp/Tunnel/TunnelsManager.swift
-10
View File
@@ -5,10 +5,6 @@ import Foundation
import NetworkExtension
import os.log
#if os(iOS)
import Intents
#endif
protocol TunnelsManagerListDelegate: AnyObject {
func tunnelAdded(at index: Int)
func tunnelModified(at index: Int)
@@ -311,12 +307,6 @@ class TunnelsManager {
}
#elseif os(iOS)
(tunnelProviderManager.protocolConfiguration as? NETunnelProviderProtocol)?.destroyConfigurationReference()
INInteraction.delete(with: "com.wireguard.intents.tunnel.\(tunnel.name)") { error in
if let error = error {
wg_log(.error, message: "Error deleting donated interactions for tunnel \(tunnel.name): \(error.localizedDescription)")
}
}
#else
#error("Unimplemented")
#endif
Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift
-16
View File
@@ -2,7 +2,6 @@
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.
import UIKit
import Intents
class MainViewController: UISplitViewController {
@@ -97,25 +96,10 @@ extension MainViewController {
if let tunnel = tunnelsManager.tunnel(named: tunnelName) {
tunnelsListVC.showTunnelDetail(for: tunnel, animated: false)
if shouldToggleStatus {
let intent = SetTunnelStatusIntent()
intent.tunnel = tunnel.name
intent.operation = .turn
if tunnel.status == .inactive {
tunnelsManager.startActivation(of: tunnel)
intent.state = .on
} else if tunnel.status == .active {
tunnelsManager.startDeactivation(of: tunnel)
intent.state = .off
}
let interaction = INInteraction(intent: intent, response: nil)
interaction.groupIdentifier = "com.wireguard.intents.tunnel.\(tunnel.name)"
interaction.donate { error in
if let error = error {
wg_log(.error, message: "Error donating interaction for SetTunnelStatusIntent: \(error.localizedDescription)")
}
}
}
}
Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift
-12
View File
@@ -388,18 +388,6 @@ extension TunnelDetailTableViewController {
cell.onSwitchToggled = { [weak self] isOn in
guard let self = self else { return }
let intent = SetTunnelStatusIntent()
intent.tunnel = self.tunnel.name
intent.operation = .turn
intent.state = isOn ? .on : .off
let interaction = INInteraction(intent: intent, response: nil)
interaction.groupIdentifier = "com.wireguard.intents.tunnel.\(self.tunnel.name)"
interaction.donate { error in
if let error = error {
wg_log(.error, message: "Error donating interaction for SetTunnelStatusIntent: \(error.localizedDescription)")
}
}
if self.tunnel.hasOnDemandRules {
self.tunnelsManager.setOnDemandEnabled(isOn, on: self.tunnel) { error in
if error == nil && !isOn {
Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift
-14
View File
@@ -4,7 +4,6 @@
import UIKit
import MobileCoreServices
import UserNotifications
import Intents
class TunnelsListTableViewController: UIViewController {
@@ -318,19 +317,6 @@ extension TunnelsListTableViewController: UITableViewDataSource {
cell.tunnel = tunnel
cell.onSwitchToggled = { [weak self] isOn in
guard let self = self, let tunnelsManager = self.tunnelsManager else { return }
let intent = SetTunnelStatusIntent()
intent.tunnel = tunnel.name
intent.operation = .turn
intent.state = isOn ? .on : .off
let interaction = INInteraction(intent: intent, response: nil)
interaction.groupIdentifier = "com.wireguard.intents.tunnel.\(tunnel.name)"
interaction.donate { error in
if let error = error {
wg_log(.error, message: "Error donating interaction for SetTunnelStatusIntent: \(error.localizedDescription)")
}
}
if tunnel.hasOnDemandRules {
tunnelsManager.setOnDemandEnabled(isOn, on: tunnel) { error in
if error == nil && !isOn {