Merge branch 'remove-no-wg-key'

30 files changed, 3 insertions, 57 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/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml
index 88fac24026..2d30a818c8 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Der blev ikke fundet nogen matchende servere.</string>
     <string name="no_matching_servers_found_second_line">Prøv at ændre dine filtre.</string>
     <string name="no_recent_selection">Ingen nylig valghistorik</string>
-    <string name="no_wireguard_key">Gyldig WireGuard-nøgle mangler. Administrer nøgler under Avancerede indstillinger.</string>
     <string name="not_found">Ikke fundet</string>
     <string name="number_of_providers">Udbydere: %1$d</string>
     <string name="obfuscation_info">Tilsløring skjuler WireGuard-trafikken inden i en anden protokol. Det kan bruges til at hjælpe med at omgå censur og andre typer filtrering, hvor en almindelig WireGuard-forbindelse ville blive blokeret.</string>
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
index 40645b1ec9..2b8c018ab7 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Keine passenden Server gefunden.</string>
     <string name="no_matching_servers_found_second_line">Bitte versuchen Sie, Ihre Filter anzupassen.</string>
     <string name="no_recent_selection">Kein aktueller Auswahlverlauf</string>
-    <string name="no_wireguard_key">Gültiger WireGuard-Schlüssel fehlt. Sie können Ihre Schlüssel in den erweiterten Einstellungen verwalten.</string>
     <string name="not_found">Nicht gefunden</string>
     <string name="number_of_providers">Provider: %1$d</string>
     <string name="obfuscation_info">Bei der Verschleierung wird der WireGuard-Datenverkehr in einem anderen Protokoll versteckt. Sie kann dazu verwendet werden, Zensur und andere Arten von Filtern zu umgehen, bei denen eine reine WireGuard-Verbindung blockiert würde.</string>
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
index e8bb151ead..e6abf7ee1f 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">No se han encontrado servidores coincidentes.</string>
     <string name="no_matching_servers_found_second_line">Intente cambiar los filtros.</string>
     <string name="no_recent_selection">No hay historial de selecciones recientes</string>
-    <string name="no_wireguard_key">Falta una clave de WireGuard válida. Para administrar las claves, vaya a Configuración avanzada.</string>
     <string name="not_found">No encontrado</string>
     <string name="number_of_providers">Proveedores: %1$d</string>
     <string name="obfuscation_info">La ofuscación oculta el tráfico de WireGuard dentro de otro protocolo. Puede usarse para sortear la censura y otros tipos de filtrado donde podría bloquearse una conexión de WireGuard normal.</string>
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
index c49c3a09e4..d5e392cb88 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Vastaavia palvelimia ei löytynyt.</string>
     <string name="no_matching_servers_found_second_line">Kokeile muuttaa suodattimiasi.</string>
     <string name="no_recent_selection">Ei viimeisimpien valintojen historiaa</string>
-    <string name="no_wireguard_key">Käypä WireGuard-avain puuttuu. Voit hallinnoida avaimia lisäasetuksissa.</string>
     <string name="not_found">Ei löydy</string>
     <string name="number_of_providers">Palveluntarjoajat: %1$d</string>
     <string name="obfuscation_info">Hämäysteknologian käyttäminen piilottaa WireGuard-liikenteen toisen protokollan sisään. Sitä voidaan käyttää kiertämään sensuuria ja muita suodatuksia niissä tapauksissa, kun tavallinen WireGuard-yhteys muutoin estettäisi.</string>
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
index 4f1a5c46be..8e523f49e3 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Aucun serveur correspondant trouvé.</string>
     <string name="no_matching_servers_found_second_line">Veuillez essayer de changer vos filtres.</string>
     <string name="no_recent_selection">Aucun historique des sélections récentes</string>
-    <string name="no_wireguard_key">Une clé WireGuard valide manque. Gérez les clés dans les paramètres avancés.</string>
     <string name="not_found">Introuvable</string>
     <string name="number_of_providers">Fournisseurs : %1$d</string>
     <string name="obfuscation_info">La dissimulation cache le trafic WireGuard à l\'intérieur d\'un autre protocole. Elle peut être utilisée pour aider à contourner la censure et d\'autres types de filtrage, où une connexion WireGuard simple serait bloquée.</string>
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
index 2dab381da4..12f4d1cacb 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Nessun server corrispondente trovato.</string>
     <string name="no_matching_servers_found_second_line">Prova a cambiare i filtri.</string>
     <string name="no_recent_selection">Nessuna cronologia di selezioni recente</string>
-    <string name="no_wireguard_key">Manca una chiave WireGuard valida. Gestisci le chiavi da Impostazioni avanzate.</string>
     <string name="not_found">Non trovato</string>
     <string name="number_of_providers">Fornitori: %1$d</string>
     <string name="obfuscation_info">L\'offuscamento nasconde il traffico WireGuard all\'interno di un altro protocollo. Può essere utilizzato per aggirare la censura e altri tipi di filtraggio, in cui una semplice connessione WireGuard verrebbe bloccata.</string>
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
index 365b54f907..58ba7a369e 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">一致するサーバーが見つかりません。</string>
     <string name="no_matching_servers_found_second_line">条件を変更してみてください。</string>
     <string name="no_recent_selection">最近の選択履歴はありません</string>
-    <string name="no_wireguard_key">有効なWireGuard鍵が見つかりません。詳細設定で鍵を管理してください。</string>
     <string name="not_found">見つかりませんでした</string>
     <string name="number_of_providers">プロバイダ数: %1$d</string>
     <string name="obfuscation_info">難読化は、WireGuardトラフィックを別のプロトコル内に隠します。プレーンなWireGuard接続がブロックされる検閲やその他のフィルタリングを回避するために使用できます。</string>
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
index 8c318e9ce9..ac3146b5f4 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">일치하는 서버를 찾을 수 없습니다.</string>
     <string name="no_matching_servers_found_second_line">필터를 변경해 보세요.</string>
     <string name="no_recent_selection">최근 선택 내역이 없습니다</string>
-    <string name="no_wireguard_key">유효한 WireGuard 키가 없습니다. 고급 설정에서 키를 관리하세요.</string>
     <string name="not_found">찾을 수 없음</string>
     <string name="number_of_providers">제공업체: %1$d</string>
     <string name="obfuscation_info">난독 처리는 다른 프로토콜 내에서 WireGuard 트래픽을 숨깁니다. 일반 WireGuard 연결이 차단되는 상황에서 검열 및 기타 유형의 필터링을 우회하는 데 사용할 수 있습니다.</string>
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
index ad2f5cc245..9909f1216b 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">ကိုက်ညီသည့် ဆာဗာများ မတွေ့ပါ။</string>
     <string name="no_matching_servers_found_second_line">စစ်ထုတ်မှုများကို ပြောင်းကြည့်ပါ။</string>
     <string name="no_recent_selection">လတ်တလောရွေးချယ်မှု မှတ်တမ်း မရှိပါ</string>
-    <string name="no_wireguard_key">အကျုံးဝင်သည့် WireGuard ကီး မရှိပါ။ အဆင့်မြင့်ဆက်တင် အောက်တွင် ကီးများကို စီမံခန့်ခွဲပါ။</string>
     <string name="not_found">ရှာမတွေ့ပါ</string>
     <string name="number_of_providers">ပံ့ပိုးသူများ- %1$d</string>
     <string name="obfuscation_info">Obfuscation သည် အခြားပရိုတိုကောလ်အတွင်းရှိ WireGuard ကူးလူးမှုကို ဝှက်ထားပေးပါသည်။ သာမန် WireGuard ချိတ်ဆက်မှုကို ပိတ်ဆို့မည့် အခြားသော စစ်ထုတ်မှု အမျိုးအစားများနှင့် ဆင်ဆာဖြတ်တောက်ခြင်းကို ရှောင်လွှဲနိုင်စေရာတွင် ကူညီနိုင်စေရန် ၎င်းကို သုံးနိုင်ပါသည်။</string>
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
index 1953271e83..fab24b9f77 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Fant ingen matchende servere.</string>
     <string name="no_matching_servers_found_second_line">Prøv å endre filtrene.</string>
     <string name="no_recent_selection">Ingen nylig valghistorikk</string>
-    <string name="no_wireguard_key">Det mangler en gyldig WireGuard-nøkkel. Du kan behandle nøklene under avanserte innstillinger.</string>
     <string name="not_found">Ikke funnet</string>
     <string name="number_of_providers">Leverandører: %1$d</string>
     <string name="obfuscation_info">Tilsløring skjuler WireGuard-trafikken i en annen protokoll. Man kan på den måten omgå sensur og andre typer filter der en vanlig WireGuard-tilkobling ville blitt blokkert.</string>
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
index 15f60d2d31..fa5b5f0ba8 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Geen overeenkomende servers gevonden.</string>
     <string name="no_matching_servers_found_second_line">Probeer de filters te veranderen.</string>
     <string name="no_recent_selection">Geen recente selectiegeschiedenis</string>
-    <string name="no_wireguard_key">Geldige WireGuard-sleutel ontbreekt. Beheer sleutels onder Geavanceerde instellingen.</string>
     <string name="not_found">Niet gevonden</string>
     <string name="number_of_providers">Providers: %1$d</string>
     <string name="obfuscation_info">Obfuscatie verbergt het WireGuard-verkeer in een ander protocol. Het kan worden gebruikt om censuur en andere soorten filtering te omzeilen, waar een gewone WireGuard-verbinding zou worden geblokkeerd.</string>
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
index 36b56f5b2b..67189cdbea 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Nie znaleziono pasujących serwerów.</string>
     <string name="no_matching_servers_found_second_line">Spróbuj zmienić filtry.</string>
     <string name="no_recent_selection">Brak historii ostatnich wyborów</string>
-    <string name="no_wireguard_key">Brak prawidłowego klucza WireGuard. Zarządzaj kluczami w Ustawieniach zaawansowanych.</string>
     <string name="not_found">Nie znaleziono</string>
     <string name="number_of_providers">Dostawcy: %1$d</string>
     <string name="obfuscation_info">Zaciemnianie ukrywa ruch WireGuard w innym protokole. Można go użyć do obchodzenia cenzury i innych typów filtrowania, w których zwykłe połączenie WireGuard byłoby blokowane.</string>
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
index 372c0b737f..57f6290216 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Nenhum servidor correspondente encontrado.</string>
     <string name="no_matching_servers_found_second_line">Tente alterar os seus filtros.</string>
     <string name="no_recent_selection">Sem histórico de seleção recente</string>
-    <string name="no_wireguard_key">Chave WireGuard válida em falta. Faça a gestão das chaves em Definições Avançadas.</string>
     <string name="not_found">Não encontrada</string>
     <string name="number_of_providers">Fornecedores: %1$d</string>
     <string name="obfuscation_info">A ofuscação oculta o tráfego do WireGuard dentro de outro protocolo. Pode ser utilizado para ajudar a contornar a censura e outros tipos de filtragem, onde uma simples ligação WireGuard seria bloqueada.</string>
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
index 6c99730478..2db2a334f4 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Подходящих серверов не найдено.</string>
     <string name="no_matching_servers_found_second_line">Попробуйте изменить фильтры.</string>
     <string name="no_recent_selection">Нет истории недавнего выбора</string>
-    <string name="no_wireguard_key">Не найден действительный ключ WireGuard. Управлять ключами можно в дополнительных настройках.</string>
     <string name="not_found">Не найдено</string>
     <string name="number_of_providers">провайдеры: %1$d</string>
     <string name="obfuscation_info">Обфускация скрывает трафик WireGuard внутри другого протокола. Это может использоваться для обхода цензуры и других видов фильтрации, когда обычные соединения WireGuard блокируются.</string>
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
index 978543e12a..f1f03205db 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Inga överensstämmande servrar hittades.</string>
     <string name="no_matching_servers_found_second_line">Prova att ändra dina filter.</string>
     <string name="no_recent_selection">Ingen historik av senaste val</string>
-    <string name="no_wireguard_key">Giltig WireGuard-nyckel saknas. Hantera nycklar i Avancerade inställningar.</string>
     <string name="not_found">Hittades inte</string>
     <string name="number_of_providers">Leverantörer: %1$d</string>
     <string name="obfuscation_info">Obfuskering döljer WireGuard-trafik inne i ett annat protokoll. Det kan användas för att kringgå censur och andra filtertyper där en vanlig WireGuard-anslutning skulle blockeras.</string>
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
index 7d74802461..850007be38 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">ไม่พบเซิร์ฟเวอร์ที่ตรงกัน</string>
     <string name="no_matching_servers_found_second_line">โปรดลองเปลี่ยนตัวกรองของคุณ</string>
     <string name="no_recent_selection">ไม่มีประวัติการเลือกล่าสุด</string>
-    <string name="no_wireguard_key">คีย์ WireGuard ที่ใช้ได้ขาดหายไป จัดการคีย์ภายใต้การตั้งค่าขั้นสูง</string>
     <string name="not_found">ไม่พบ</string>
     <string name="number_of_providers">ผู้ให้บริการ: %1$d</string>
     <string name="obfuscation_info">การทำให้ข้อมูลยุ่งเหยิงจะซ่อนการรับส่งข้อมูล WireGuard ภายในอีกโพรโทคอลหนึ่ง ซึ่งใช้เพื่อช่วยหลบเลี่ยงการเซ็นเซอร์ และการกรองประเภทอื่นๆ ที่การเชื่อมต่อ WireGuard แบบธรรมดาจะถูกบล็อกได้</string>
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
index 8dcb51caf1..d6b85efa06 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">Eşleşen sunucu bulunamadı.</string>
     <string name="no_matching_servers_found_second_line">Lütfen filtrelerinizi değiştirmeyi deneyin.</string>
     <string name="no_recent_selection">Son seçim geçmişi yok</string>
-    <string name="no_wireguard_key">Geçerli WireGuard anahtarı eksik. Gelişmiş ayarlardan anahtarları yönetin.</string>
     <string name="not_found">Bulunamadı</string>
     <string name="number_of_providers">Hizmet sağlayıcılar: %1$d</string>
     <string name="obfuscation_info">Gizleme, WireGuard trafiğini başka bir protokolün içinde gizler. Normal bir WireGuard bağlantısının engelleneceği sansürü ve diğer filtreleme türlerini aşmaya yardımcı olmak için kullanılabilir.</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
index 0e5241f9e1..82681ab2a9 100644
--- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">找不到匹配的服务器。</string>
     <string name="no_matching_servers_found_second_line">请更改您的筛选器。</string>
     <string name="no_recent_selection">无最近选择历史记录</string>
-    <string name="no_wireguard_key">缺少有效的 WireGuard 密钥。在“高级”设置下管理密钥。</string>
     <string name="not_found">找不到</string>
     <string name="number_of_providers">提供商：%1$d</string>
     <string name="obfuscation_info">混淆会将 WireGuard 流量隐藏在其他协议中。这有助于规避审查和其他类型的过滤，在这些过滤中，普通 WireGuard 连接将被阻止。</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
index f1fccb809a..13041d04fa 100644
--- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
+++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
@@ -278,7 +278,6 @@
     <string name="no_matching_servers_found_first_line">找不到相符的伺服器。</string>
     <string name="no_matching_servers_found_second_line">請變更您的篩選器試試。</string>
     <string name="no_recent_selection">無最近選擇歷史</string>
-    <string name="no_wireguard_key">缺少有效的 WireGuard 金鑰。在「進階」設定下管理金鑰。</string>
     <string name="not_found">找不到</string>
     <string name="number_of_providers">供應商：%1$d</string>
     <string name="obfuscation_info">藉由混淆，WireGuard 的流量能隱藏在另一個通訊協定中。這有助於規避審查或其他類型的篩選。在這類篩選中，普通 WireGuard 連線將遭到封鎖。</string>
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 1aac455e0c..df89404424 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -117,7 +117,6 @@
     <string name="start_tunnel_error">Unable to start tunnel connection. Please send a problem report.</string>
     <string name="vpn_permission_denied_error">VPN permission was denied or another app has \"Always-on VPN\" enabled</string>
     <string name="no_matching_relay">No servers match your settings, try changing server or other settings.</string>
-    <string name="no_wireguard_key">Valid WireGuard key is missing. Manage keys under Advanced settings.</string>
     <string name="custom_dns_hint">Enter IP</string>
     <string name="custom_tunnel_host_resolution_error">Unable to resolve host of custom tunnel. Try changing your settings.</string>
     <string name="is_offline">Your device is offline. The tunnel will automatically connect once your device is back online.</string>
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..12c827fca2 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 ""
@@ -3520,9 +3514,6 @@ msgstr ""
 msgid "VPN tunnel status"
 msgstr ""
 
-msgid "Valid WireGuard key is missing. Manage keys under Advanced settings."
-msgstr ""
-
 msgid "Valid ranges: %s"
 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,