From: Alessio Nossa Date: Tue, 27 Feb 2024 23:16:19 +0000 (+0100) Subject: Remove missing peers error in UpdateTunnelConfiguration Intent X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c4d6cc4dce69ee8bdc613078a1d284480e953b;p=thirdparty%2Fwireguard-apple.git Remove missing peers error in UpdateTunnelConfiguration Intent Signed-off-by: Alessio Nossa --- diff --git a/Sources/WireguardAppIntents/AppIntents.strings b/Sources/WireguardAppIntents/AppIntents.strings index 1c2064e..cfc183b 100644 --- a/Sources/WireguardAppIntents/AppIntents.strings +++ b/Sources/WireguardAppIntents/AppIntents.strings @@ -20,7 +20,6 @@ "updateTunnelConfigurationIntentSummary ${tunnelName}" = "Update ${tunnelName} configuration"; "updateTunnelConfigurationIntentPeerOptionsUnavailableError" = "Use the output of \"Build Peer Configuration\" action to update tunnel configuration."; -"updateTunnelConfigurationIntentMissingPeerParameterError" = "Peer parameter value is missing"; "updateTunnelConfigurationIntentMalformedPublicKeyError %@" = "The key \"%1$@\" is not a valid Public Key encoded in Base64 format."; // Build Peer Configuration diff --git a/Sources/WireguardAppIntents/UpdateTunnelConfiguration.swift b/Sources/WireguardAppIntents/UpdateTunnelConfiguration.swift index 51fc605..68e88fa 100644 --- a/Sources/WireguardAppIntents/UpdateTunnelConfiguration.swift +++ b/Sources/WireguardAppIntents/UpdateTunnelConfiguration.swift @@ -33,7 +33,7 @@ struct UpdateTunnelConfiguration: AppIntent { var tunnelsManager: TunnelsManager func perform() async throws -> some IntentResult { - guard let peers else { throw AppIntentConfigurationUpdateError.missingPeerParameter } + let peers = peers ?? [] guard let tunnelContainer = tunnelsManager.tunnel(named: tunnelName) else { throw AppIntentConfigurationUpdateError.wrongTunnel(name: tunnelName) @@ -114,7 +114,6 @@ enum AppIntentConfigurationUpdateError: Swift.Error, CustomLocalizedStringResour case wrongTunnel(name: String) case missingConfiguration case peerOptionsUnavailable - case missingPeerParameter case malformedPublicKey(key: String) var localizedStringResource: LocalizedStringResource { @@ -125,8 +124,6 @@ enum AppIntentConfigurationUpdateError: Swift.Error, CustomLocalizedStringResour return LocalizedStringResource("wireguardAppIntentsMissingConfigurationError", table: "AppIntents") case .peerOptionsUnavailable: return LocalizedStringResource("updateTunnelConfigurationIntentPeerOptionsUnavailableError", table: "AppIntents") - case .missingPeerParameter: - return LocalizedStringResource("updateTunnelConfigurationIntentMissingPeerParameterError", table: "AppIntents") case .malformedPublicKey(let malformedKey): return LocalizedStringResource("updateTunnelConfigurationIntentMalformedPublicKeyError \(malformedKey)", table: "AppIntents") }