Handle legacy always-on vpn profiles

Co-authored-by: Jonatan Rhodin <jonatan.rhodin@mullvad.net>

2 files changed, 17 insertions, 9 deletions

diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index ca8a81df02..441ed2889e 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -2290,10 +2290,10 @@ msgstr ""
 msgid "All overrides will be reset and servers IP addresses, in the Select location view, will go back to default."
 msgstr ""
 
-msgid "Always-on VPN assigned to other app"
+msgid "Always-on VPN assigned to %s"
 msgstr ""
 
-msgid "Always-on VPN might be enabled for another app"
+msgid "Always-on VPN assigned to other app"
 msgstr ""
 
 msgid "App info"
@@ -2440,6 +2440,9 @@ msgstr ""
 msgid "Expand"
 msgstr ""
 
+msgid "FAILED TO CONNECT"
+msgstr ""
+
 msgid "Failed to apply patch"
 msgstr ""
 
@@ -2551,6 +2554,9 @@ msgstr ""
 msgid "Please enter a valid remote server port"
 msgstr ""
 
+msgid "Please press connect to request VPN permission"
+msgstr ""
+
 msgid "Privacy"
 msgstr ""
 
@@ -2665,6 +2671,9 @@ msgstr ""
 msgid "Unable to parse patch"
 msgstr ""
 
+msgid "Unable to start tunnel connection. Please disable Always-on VPN before using Mullvad VPN."
+msgstr ""
+
 msgid "Unable to start tunnel connection. Please disable Always-on VPN for <b>%s</b> before using Mullvad VPN."
 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 37e5c7fcf5..ee4939e65c 100644
--- a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
+++ b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts
@@ -60,10 +60,6 @@ import {
 } from '../shared/daemon-rpc-types';
 import * as grpcTypes from './management_interface/management_interface_pb';
 
-const invalidErrorStateCause = new Error(
-  'VPN_PERMISSION_DENIED is not a valid error state cause on desktop',
-);
-
 export class ResponseParseError extends Error {
   constructor(message: string) {
     super(message);
@@ -275,9 +271,12 @@ function convertFromTunnelStateError(state: grpcTypes.ErrorState.AsObject): Erro
         ...baseError,
         cause: ErrorStateCause.needFullDiskPermissions,
       };
-    case grpcTypes.ErrorState.Cause.VPN_PERMISSION_DENIED:
-      // VPN_PERMISSION_DENIED is only ever created on Android
-      throw invalidErrorStateCause;
+    // These are only ever created on Android
+    case grpcTypes.ErrorState.Cause.INVALID_DNS_SERVERS:
+    case grpcTypes.ErrorState.Cause.NOT_PREPARED:
+    case grpcTypes.ErrorState.Cause.OTHER_ALWAYS_ON_APP:
+    case grpcTypes.ErrorState.Cause.OTHER_LEGACY_ALWAYS_ON_VPN:
+      throw new Error('Unsupported error state cause: ' + state.cause);
   }
 }