From 3ac0739323804dd7f48b7e89d4f89c01d2dd1d6a Mon Sep 17 00:00:00 2001 From: Jamil Date: Tue, 19 Mar 2024 13:09:30 -0700 Subject: [PATCH] refactor(apple): Expose hasUnappliedChanges (#4211) Exposing the var for now. This is all removed and much simplified in #4133 --- swift/apple/FirezoneNetworkExtension/Adapter.swift | 1 + swift/apple/FirezoneNetworkExtension/NetworkSettings.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/swift/apple/FirezoneNetworkExtension/Adapter.swift b/swift/apple/FirezoneNetworkExtension/Adapter.swift index aafdafbd6..10fbf648c 100644 --- a/swift/apple/FirezoneNetworkExtension/Adapter.swift +++ b/swift/apple/FirezoneNetworkExtension/Adapter.swift @@ -460,6 +460,7 @@ extension Adapter: CallbackHandlerDelegate { networkSettings.routes6 = try! JSONDecoder().decode( [NetworkSettings.Cidr].self, from: routeList6.data(using: .utf8)! ).compactMap { $0.asNEIPv6Route } + networkSettings.hasUnappliedChanges = true networkSettings.apply(on: packetTunnelProvider, logger: self.logger, completionHandler: nil) } diff --git a/swift/apple/FirezoneNetworkExtension/NetworkSettings.swift b/swift/apple/FirezoneNetworkExtension/NetworkSettings.swift index 6905a2517..62e062b22 100644 --- a/swift/apple/FirezoneNetworkExtension/NetworkSettings.swift +++ b/swift/apple/FirezoneNetworkExtension/NetworkSettings.swift @@ -28,7 +28,7 @@ class NetworkSettings { private(set) var matchDomains: [String] = [""] // To keep track of modifications - private(set) var hasUnappliedChanges: Bool + public var hasUnappliedChanges: Bool init( tunnelAddressIPv4: String, tunnelAddressIPv6: String, dnsAddresses: [String]