Merge branch 'remove-automatic-tunnel-option-from-gui-des-1787'

Author: MarkusPettersson98

desktop/packages/mullvad-vpn/locales/messages.pot

@@ -1312,8 +1312,8 @@ msgstr ""
 #. available.
 #. Available placeholders:
 #. %(transportProtocol)s - the name of the transport protocol setting
-#. %(automat)s - the translation of "Automatic"
-#. %(openvpn)s - will be replaced with OpenVPN
+#. %(automatic)s - the translation of "Automatic"
+#. %(tcp)s - the translation of "TCP"
 msgctxt "openvpn-settings-view"
 msgid "To activate Bridge mode, change <b>%(transportProtocol)s</b> to <b>%(automatic)s</b> or <b>%(tcp)s</b>."
 msgstr ""
@@ -2217,7 +2217,7 @@ msgid "Shadowsocks"
 msgstr ""
 
 msgctxt "wireguard-settings-view"
-msgid "Switch to “%(wireguard)s” or “%(automatic)s” in Settings > %(tunnelProtocol)s to make %(setting)s available."
+msgid "Switch to “%(wireguard)s” in Settings > %(tunnelProtocol)s to make %(setting)s available."
 msgstr ""
 
 msgctxt "wireguard-settings-view"

desktop/packages/mullvad-vpn/src/main/default-settings.ts

@@ -1,10 +1,35 @@
 import {
   ApiAccessMethodSettings,
+  IOpenVpnConstraints,
+  IRelaySettingsNormal,
   ISettings,
+  IWireguardConstraints,
   ObfuscationType,
   Ownership,
 } from '../shared/daemon-rpc-types';
 
+export function getDefaultRelaySettingsNormal(): IRelaySettingsNormal<
+  IOpenVpnConstraints,
+  IWireguardConstraints
+> {
+  return {
+    location: 'any',
+    tunnelProtocol: 'wireguard',
+    providers: [],
+    ownership: Ownership.any,
+    openvpnConstraints: {
+      port: 'any',
+      protocol: 'any',
+    },
+    wireguardConstraints: {
+      port: 'any',
+      ipVersion: 'any',
+      useMultihop: false,
+      entryLocation: 'any',
+    },
+  };
+}
+
 export function getDefaultSettings(): ISettings {
   return {
     allowLan: false,
@@ -16,22 +41,7 @@ export function getDefaultSettings(): ISettings {
       appsList: [],
     },
     relaySettings: {
-      normal: {
-        location: 'any',
-        tunnelProtocol: 'any',
-        providers: [],
-        ownership: Ownership.any,
-        openvpnConstraints: {
-          port: 'any',
-          protocol: 'any',
-        },
-        wireguardConstraints: {
-          port: 'any',
-          ipVersion: 'any',
-          useMultihop: false,
-          entryLocation: 'any',
-        },
-      },
+      normal: getDefaultRelaySettingsNormal(),
     },
     bridgeSettings: {
       type: 'normal',

desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts

@@ -498,10 +498,7 @@ function convertFromRelaySettings(
         const normal = relaySettings.getNormal()!;
         const locationConstraint = convertFromLocationConstraint(normal.getLocation());
         const location = wrapConstraint(locationConstraint);
-        // `getTunnelType()` is not falsy if type is 'any'
-        const tunnelProtocol = convertFromTunnelTypeConstraint(
-          normal.hasTunnelType() ? normal.getTunnelType() : undefined,
-        );
+        const tunnelProtocol = convertFromTunnelType(normal.getTunnelType());
         const providers = normal.getProvidersList();
         const ownership = convertFromOwnership(normal.getOwnership());
         const openvpnConstraints = convertFromOpenVpnConstraints(normal.getOpenvpnConstraints()!);
@@ -824,22 +821,6 @@ function convertFromWireguardConstraints(
   return result;
 }
 
-function convertFromTunnelTypeConstraint(
-  constraint: grpcTypes.TunnelType | undefined,
-): Constraint<TunnelProtocol> {
-  switch (constraint) {
-    case grpcTypes.TunnelType.WIREGUARD: {
-      return { only: 'wireguard' };
-    }
-    case grpcTypes.TunnelType.OPENVPN: {
-      return { only: 'openvpn' };
-    }
-    default: {
-      return 'any';
-    }
-  }
-}
-
 function convertFromConstraint<T>(value: T | undefined): Constraint<T> {
   if (value) {
     return { only: value };
@@ -853,9 +834,7 @@ export function convertToRelayConstraints(
 ): grpcTypes.NormalRelaySettings {
   const relayConstraints = new grpcTypes.NormalRelaySettings();
 
-  if (constraints.tunnelProtocol !== 'any') {
-    relayConstraints.setTunnelType(convertToTunnelType(constraints.tunnelProtocol.only));
-  }
+  relayConstraints.setTunnelType(convertToTunnelType(constraints.tunnelProtocol));
   relayConstraints.setLocation(convertToLocation(unwrapConstraint(constraints.location)));
   relayConstraints.setWireguardConstraints(
     convertToWireguardConstraints(constraints.wireguardConstraints),

desktop/packages/mullvad-vpn/src/renderer/app.tsx

@@ -650,7 +650,7 @@ export default class AppRenderer {
             useMultihop: wireguardConstraints.useMultihop,
             entryLocation: liftConstraint(wireguardConstraints.entryLocation),
           },
-          tunnelProtocol: liftConstraint(tunnelProtocol),
+          tunnelProtocol,
         },
       });
     } else if ('customTunnelEndpoint' in relaySettings) {

desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx

@@ -273,14 +273,19 @@ function DirectOnlyModalMessage() {
 }
 
 function featureUnavailableMessage() {
-  const automatic = messages.gettext('Automatic');
   const tunnelProtocol = messages.pgettext('vpn-settings-view', 'Tunnel protocol');
 
   return sprintf(
     messages.pgettext(
+      // TRANSLATORS: Informs the user that the the feature is only available when WireGuard
+      // TRANSLATORS: is selected.
+      // TRANSLATORS: Available placeholders:
+      // TRANSLATORS: %(wireguard)s - will be replaced with WireGuard
+      // TRANSLATORS: %(tunnelProtocol)s - the name of the tunnel protocol setting
+      // TRANSLATORS: %(setting)s - the name of the setting
       'wireguard-settings-view',
-      'Switch to “%(wireguard)s” or “%(automatic)s” in Settings > %(tunnelProtocol)s to make %(setting)s available.',
+      'Switch to “%(wireguard)s” in Settings > %(tunnelProtocol)s to make %(setting)s available.',
     ),
-    { wireguard: strings.wireguard, automatic, tunnelProtocol, setting: strings.daita },
+    { wireguard: strings.wireguard, tunnelProtocol, setting: strings.daita },
   );
 }

desktop/packages/mullvad-vpn/src/renderer/components/Filter.tsx

@@ -114,7 +114,6 @@ export default function Filter() {
 
 // Returns only the ownership options that are compatible with the other filters
 function useFilteredOwnershipOptions(providers: string[], ownership: Ownership): Ownership[] {
-  const relaySettings = useNormalRelaySettings();
   const tunnelProtocol = useTunnelProtocol();
   const bridgeState = useSelector((state) => state.settings.bridgeState);
   const locations = useSelector((state) => state.settings.relayLocations);
@@ -126,7 +125,6 @@ function useFilteredOwnershipOptions(providers: string[], ownership: Ownership):
       locations,
       endpointType,
       tunnelProtocol,
-      relaySettings,
     );
     const relaylistForFilters = filterLocations(relayListForEndpointType, ownership, providers);
 
@@ -143,14 +141,13 @@ function useFilteredOwnershipOptions(providers: string[], ownership: Ownership):
     }
 
     return ownershipOptions;
-  }, [locations, endpointType, tunnelProtocol, relaySettings, ownership, providers]);
+  }, [locations, endpointType, tunnelProtocol, ownership, providers]);
 
   return availableOwnershipOptions;
 }
 
 // Returns only the providers that are compatible with the other filters
 export function useFilteredProviders(providers: string[], ownership: Ownership): string[] {
-  const relaySettings = useNormalRelaySettings();
   const tunnelProtocol = useTunnelProtocol();
   const bridgeState = useSelector((state) => state.settings.bridgeState);
   const locations = useSelector((state) => state.settings.relayLocations);
@@ -162,11 +159,10 @@ export function useFilteredProviders(providers: string[], ownership: Ownership):
       locations,
       endpointType,
       tunnelProtocol,
-      relaySettings,
     );
     const relaylistForFilters = filterLocations(relayListForEndpointType, ownership, providers);
     return providersFromRelays(relaylistForFilters);
-  }, [endpointType, locations, ownership, providers, relaySettings, tunnelProtocol]);
+  }, [endpointType, locations, ownership, providers, tunnelProtocol]);
 
   return availableProviders;
 }
@@ -188,12 +184,7 @@ function useProviders(): Record<string, boolean> {
 
   const endpointType =
     tunnelProtocol === 'openvpn' && bridgeState === 'on' ? EndpointType.any : EndpointType.exit;
-  const relays = filterLocationsByEndPointType(
-    relayLocations,
-    endpointType,
-    tunnelProtocol,
-    relaySettings,
-  );
+  const relays = filterLocationsByEndPointType(relayLocations, endpointType, tunnelProtocol);
   const providers = providersFromRelays(relays);
 
   // Empty containt array means that all providers are selected. No selection isn't possible.

desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx

@@ -106,15 +106,20 @@ function MultihopSetting() {
 }
 
 function featureUnavailableMessage() {
-  const automatic = messages.gettext('Automatic');
   const tunnelProtocol = messages.pgettext('vpn-settings-view', 'Tunnel protocol');
   const multihop = messages.pgettext('wireguard-settings-view', 'Multihop');
 
   return sprintf(
     messages.pgettext(
+      // TRANSLATORS: Informs the user that the the feature is only available when WireGuard
+      // TRANSLATORS: is selected.
+      // TRANSLATORS: Available placeholders:
+      // TRANSLATORS: %(wireguard)s - will be replaced with WireGuard
+      // TRANSLATORS: %(tunnelProtocol)s - the name of the tunnel protocol setting
+      // TRANSLATORS: %(setting)s - the name of the setting
       'wireguard-settings-view',
-      'Switch to “%(wireguard)s” or “%(automatic)s” in Settings > %(tunnelProtocol)s to make %(setting)s available.',
+      'Switch to “%(wireguard)s” in Settings > %(tunnelProtocol)s to make %(setting)s available.',
     ),
-    { wireguard: strings.wireguard, automatic, tunnelProtocol, setting: multihop },
+    { wireguard: strings.wireguard, tunnelProtocol, setting: multihop },
   );
 }

desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx

@@ -375,8 +375,8 @@ function bridgeModeFooterText(
         // TRANSLATORS: available.
         // TRANSLATORS: Available placeholders:
         // TRANSLATORS: %(transportProtocol)s - the name of the transport protocol setting
-        // TRANSLATORS: %(automat)s - the translation of "Automatic"
-        // TRANSLATORS: %(openvpn)s - will be replaced with OpenVPN
+        // TRANSLATORS: %(automatic)s - the translation of "Automatic"
+        // TRANSLATORS: %(tcp)s - the translation of "TCP"
         messages.pgettext(
           'openvpn-settings-view',
           'To activate Bridge mode, change <b>%(transportProtocol)s</b> to <b>%(automatic)s</b> or <b>%(tcp)s</b>.',

desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx

@@ -3,7 +3,7 @@ import { sprintf } from 'sprintf-js';
 import styled from 'styled-components';
 
 import { strings } from '../../shared/constants';
-import { IDnsOptions, TunnelProtocol, wrapConstraint } from '../../shared/daemon-rpc-types';
+import { IDnsOptions, TunnelProtocol } from '../../shared/daemon-rpc-types';
 import { messages } from '../../shared/gettext';
 import log from '../../shared/logging';
 import { useAppContext } from '../context';
@@ -664,9 +664,8 @@ function LockdownMode() {
 }
 
 function TunnelProtocolSetting() {
-  const tunnelProtocol = useSelector((state) =>
-    mapRelaySettingsToProtocol(state.settings.relaySettings),
-  );
+  const tunnelProtocol = useTunnelProtocol();
+
   const relaySettingsUpdater = useRelaySettingsUpdater();
 
   const relaySettings = useSelector((state) => state.settings.relaySettings);
@@ -689,11 +688,11 @@ function TunnelProtocolSetting() {
   }
 
   const setTunnelProtocol = useCallback(
-    async (tunnelProtocol: TunnelProtocol | null) => {
+    async (tunnelProtocol: TunnelProtocol) => {
       try {
         await relaySettingsUpdater((settings) => ({
           ...settings,
-          tunnelProtocol: wrapConstraint(tunnelProtocol),
+          tunnelProtocol,
         }));
       } catch (e) {
         const error = e as Error;
@@ -723,9 +722,8 @@ function TunnelProtocolSetting() {
       <Selector
         title={messages.pgettext('vpn-settings-view', 'Tunnel protocol')}
         items={tunnelProtocolItems}
-        value={tunnelProtocol ?? null}
+        value={tunnelProtocol}
         onSelect={setTunnelProtocol}
-        automaticValue={null}
       />
       {openVpnDisabled ? (
         <Cell.CellFooter>
@@ -749,7 +747,7 @@ function TunnelProtocolSetting() {
 function mapRelaySettingsToProtocol(relaySettings: RelaySettingsRedux) {
   if ('normal' in relaySettings) {
     const { tunnelProtocol } = relaySettings.normal;
-    return tunnelProtocol === 'any' ? undefined : tunnelProtocol;
+    return tunnelProtocol;
     // since the GUI doesn't display custom settings, just display the default ones.
     // If the user sets any settings, then those will be applied.
   } else if ('customTunnelEndpoint' in relaySettings) {

desktop/packages/mullvad-vpn/src/renderer/components/select-location/RelayListContext.tsx

@@ -78,29 +78,24 @@ export function RelayListContextProvider(props: RelayListContextProviderProps) {
   const relayListForEndpointType = useMemo(() => {
     const endpointType =
       locationType === LocationType.entry ? EndpointType.entry : EndpointType.exit;
-    return filterLocationsByEndPointType(
-      fullRelayList,
-      endpointType,
-      tunnelProtocol,
-      relaySettings,
-    );
-  }, [fullRelayList, locationType, relaySettings, tunnelProtocol]);
+    return filterLocationsByEndPointType(fullRelayList, endpointType, tunnelProtocol);
+  }, [fullRelayList, locationType, tunnelProtocol]);
 
   const relayListForDaita = useMemo(() => {
     return filterLocationsByDaita(
       relayListForEndpointType,
       daita,
       directOnly,
       locationType,
-      relaySettings?.tunnelProtocol ?? 'any',
+      tunnelProtocol,
       relaySettings?.wireguard.useMultihop ?? false,
     );
   }, [
     daita,
     directOnly,
     locationType,
     relayListForEndpointType,
-    relaySettings?.tunnelProtocol,
+    tunnelProtocol,
     relaySettings?.wireguard.useMultihop,
   ]);
 

desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx

@@ -9,7 +9,7 @@ import { useRelaySettingsUpdater } from '../../lib/constraint-updater';
 import { daitaFilterActive, filterSpecialLocations } from '../../lib/filter-locations';
 import { useHistory } from '../../lib/history';
 import { formatHtml } from '../../lib/html-formatter';
-import { useNormalRelaySettings } from '../../lib/relay-settings-hooks';
+import { useNormalRelaySettings, useTunnelProtocol } from '../../lib/relay-settings-hooks';
 import { RoutePath } from '../../lib/routes';
 import { useSelector } from '../../redux/store';
 import { AppNavigationHeader } from '../';
@@ -56,6 +56,7 @@ export default function SelectLocation() {
   const { expandSearchResults } = useRelayListContext();
 
   const relaySettings = useNormalRelaySettings();
+  const tunnelProtocol = useTunnelProtocol();
   const ownership = relaySettings?.ownership ?? Ownership.any;
   const providers = relaySettings?.providers ?? [];
   const filteredProviders = useFilteredProviders(providers, ownership);
@@ -65,7 +66,7 @@ export default function SelectLocation() {
     daita,
     directOnly,
     locationType,
-    relaySettings?.tunnelProtocol ?? 'any',
+    tunnelProtocol,
     relaySettings?.wireguard.useMultihop ?? false,
   );
 
@@ -74,7 +75,6 @@ export default function SelectLocation() {
   const onClose = useCallback(() => history.pop(), [history]);
   const onViewFilter = useCallback(() => history.push(RoutePath.filter), [history]);
 
-  const tunnelProtocol = relaySettings?.tunnelProtocol ?? 'any';
   const bridgeState = useSelector((state) => state.settings.bridgeState);
   const allowEntrySelection =
     (tunnelProtocol === 'openvpn' && bridgeState === 'on') ||