Remove unused 'no wireguard key' error

10 files changed, 3 insertions, 34 deletions

diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
index b60e2d8444..497021f1d2 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt
@@ -315,8 +315,6 @@ internal fun ManagementInterface.ErrorState.GenerationError.toDomain(): Paramete
             ParameterGenerationError.NoMatchingRelay
         ManagementInterface.ErrorState.GenerationError.NO_MATCHING_BRIDGE_RELAY ->
             ParameterGenerationError.NoMatchingBridgeRelay
-        ManagementInterface.ErrorState.GenerationError.NO_WIREGUARD_KEY ->
-            ParameterGenerationError.NoWireguardKey
         ManagementInterface.ErrorState.GenerationError.CUSTOM_TUNNEL_HOST_RESOLUTION_ERROR ->
             ParameterGenerationError.CustomTunnelHostResolutionError
         ManagementInterface.ErrorState.GenerationError.NETWORK_IPV4_UNAVAILABLE ->
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
index dd4e65a03a..6db152ac00 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
@@ -5,7 +5,6 @@ enum class ParameterGenerationError {
     NoMatchingRelayExit,
     NoMatchingRelay,
     NoMatchingBridgeRelay,
-    NoWireguardKey,
     CustomTunnelHostResolutionError,
     Ipv4_Unavailable,
     Ipv6_Unavailable,
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt
index 53c56549b1..9a052d0eaa 100644
--- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt
+++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt
@@ -294,7 +294,6 @@ private fun ParameterGenerationError.errorMessageId(): Int =
         ParameterGenerationError.NoMatchingRelayEntry -> {
             R.string.no_matching_relay_entry
         }
-        ParameterGenerationError.NoWireguardKey -> R.string.no_wireguard_key
         ParameterGenerationError.CustomTunnelHostResolutionError ->
             R.string.custom_tunnel_host_resolution_error
         ParameterGenerationError.Ipv4_Unavailable -> R.string.ip_version_v4_unavailable
diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index 89cf65a2a4..d01b9e1fc5 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -1808,12 +1808,6 @@ msgctxt "notifications"
 msgid "Upgrade"
 msgstr ""
 
-#. Available placeholders:
-#. %(wireguard)s - will be replaced with "WireGuard"
-msgctxt "notifications"
-msgid "Valid %(wireguard)s key is missing. Manage keys under Advanced settings."
-msgstr ""
-
 msgctxt "notifications"
 msgid "Your device is offline. The tunnel will automatically connect once your device is back online."
 msgstr ""
diff --git a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
index 0387219756..c000b87fed 100644
--- a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
+++ b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
@@ -334,8 +334,6 @@ function convertFromParameterError(
       return TunnelParameterError.noMatchingRelay;
     case grpcTypes.ErrorState.GenerationError.NO_MATCHING_BRIDGE_RELAY:
       return TunnelParameterError.noMatchingBridgeRelay;
-    case grpcTypes.ErrorState.GenerationError.NO_WIREGUARD_KEY:
-      return TunnelParameterError.noWireguardKey;
     case grpcTypes.ErrorState.GenerationError.CUSTOM_TUNNEL_HOST_RESOLUTION_ERROR:
       return TunnelParameterError.customTunnelHostResolutionError;
     case grpcTypes.ErrorState.GenerationError.NETWORK_IPV4_UNAVAILABLE:
diff --git a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
index f42a9292e9..dbc482e97c 100644
--- a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts
@@ -63,7 +63,6 @@ export enum AuthFailedError {
 export enum TunnelParameterError {
   noMatchingRelay,
   noMatchingBridgeRelay,
-  noWireguardKey,
   customTunnelHostResolutionError,
   ipv4Unavailable,
   ipv6Unavailable,
diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts b/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts
index 660db9de67..082cf47833 100644
--- a/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts
@@ -214,16 +214,6 @@ export class ErrorNotificationProvider
           'notifications',
           'No servers match your settings, try changing server or other settings.',
         );
-      case TunnelParameterError.noWireguardKey:
-        return sprintf(
-          // TRANSLATORS: Available placeholders:
-          // TRANSLATORS: %(wireguard)s - will be replaced with "WireGuard"
-          messages.pgettext(
-            'notifications',
-            'Valid %(wireguard)s key is missing. Manage keys under Advanced settings.',
-          ),
-          { wireguard: strings.wireguard },
-        );
       case TunnelParameterError.customTunnelHostResolutionError:
         return messages.pgettext(
           'notifications',
diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto
index 928b704b41..4d9116e6c8 100644
--- a/mullvad-management-interface/proto/management_interface.proto
+++ b/mullvad-management-interface/proto/management_interface.proto
@@ -226,10 +226,9 @@ message ErrorState {
     NO_MATCHING_RELAY_EXIT = 1;
     NO_MATCHING_RELAY = 2;
     NO_MATCHING_BRIDGE_RELAY = 3;
-    NO_WIREGUARD_KEY = 4;
-    CUSTOM_TUNNEL_HOST_RESOLUTION_ERROR = 5;
-    NETWORK_IPV4_UNAVAILABLE = 6;
-    NETWORK_IPV6_UNAVAILABLE = 7;
+    CUSTOM_TUNNEL_HOST_RESOLUTION_ERROR = 4;
+    NETWORK_IPV4_UNAVAILABLE = 5;
+    NETWORK_IPV6_UNAVAILABLE = 6;
   }
 
   message FirewallPolicyError {
diff --git a/mullvad-management-interface/src/types/conversions/states.rs b/mullvad-management-interface/src/types/conversions/states.rs
index 002aa6ea69..fbb6f36249 100644
--- a/mullvad-management-interface/src/types/conversions/states.rs
+++ b/mullvad-management-interface/src/types/conversions/states.rs
@@ -191,9 +191,6 @@ impl From<mullvad_types::states::TunnelState> for proto::TunnelState {
                                 talpid_tunnel::ParameterGenerationError::NoMatchingBridgeRelay => {
                                     i32::from(GenerationError::NoMatchingBridgeRelay)
                                 }
-                                talpid_tunnel::ParameterGenerationError::NoWireguardKey => {
-                                    i32::from(GenerationError::NoWireguardKey)
-                                }
                                 talpid_tunnel::ParameterGenerationError::CustomTunnelHostResolutionError => {
                                     i32::from(GenerationError::CustomTunnelHostResolutionError)
                                 }
@@ -399,7 +396,6 @@ impl TryFrom<proto::TunnelState> for mullvad_types::states::TunnelState {
                             Ok(proto::error_state::GenerationError::NoMatchingBridgeRelay) => talpid_tunnel::ParameterGenerationError::NoMatchingBridgeRelay,
                             Ok(proto::error_state::GenerationError::NoMatchingRelayEntry) => talpid_tunnel::ParameterGenerationError::NoMatchingRelayEntry,
                             Ok(proto::error_state::GenerationError::NoMatchingRelayExit) => talpid_tunnel::ParameterGenerationError::NoMatchingRelayExit,
-                            Ok(proto::error_state::GenerationError::NoWireguardKey) => talpid_tunnel::ParameterGenerationError::NoWireguardKey,
                             Ok(proto::error_state::GenerationError::NetworkIpv4Unavailable) => talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V4 },
                             Ok(proto::error_state::GenerationError::NetworkIpv6Unavailable) => talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V6 },
                             Ok(proto::error_state::GenerationError::NoMatchingRelay) => talpid_tunnel::ParameterGenerationError::NoMatchingRelay,
diff --git a/talpid-types/src/tunnel.rs b/talpid-types/src/tunnel.rs
index 768c40a600..d36836a688 100644
--- a/talpid-types/src/tunnel.rs
+++ b/talpid-types/src/tunnel.rs
@@ -133,9 +133,6 @@ pub enum ParameterGenerationError {
     /// Failure to select a matching bridge relay
     #[error("Failure to select a matching bridge relay")]
     NoMatchingBridgeRelay,
-    /// Returned when tunnel parameters can't be generated because wireguard key is not available.
-    #[error("No wireguard key available")]
-    NoWireguardKey,
     /// Failure to resolve the hostname of a custom tunnel configuration
     #[error("Can't resolve hostname for custom tunnel host")]
     CustomTunnelHostResolutionError,