diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-16 11:01:14 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-07-16 11:01:14 +0200 |
| commit | eb37f45de40a72e3bb2dc2fa3366a3f8441072e9 (patch) | |
| tree | afad922e4e407896ab0ad66ce1d2139345170460 /desktop | |
| parent | 3fc75ac1e71704fa82f322fed91cacab6c962bbe (diff) | |
| parent | 7df1d3037bed7d6abfcac7f39dca4962d9f6c9af (diff) | |
| download | mullvadvpn-eb37f45de40a72e3bb2dc2fa3366a3f8441072e9.tar.xz mullvadvpn-eb37f45de40a72e3bb2dc2fa3366a3f8441072e9.zip | |
Merge branch 'show-obfuscation-feature-indicator-when-connected-over-quic-des-2267'
Diffstat (limited to 'desktop')
3 files changed, 4 insertions, 0 deletions
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 c5c6ccf4d2..6d8ebcb17b 100644 --- a/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts +++ b/desktop/packages/mullvad-vpn/src/main/grpc-type-convertions.ts @@ -396,6 +396,8 @@ function convertFromFeatureIndicator( return FeatureIndicator.daitaMultihop; case grpcTypes.FeatureIndicator.SHADOWSOCKS: return FeatureIndicator.shadowsocks; + case grpcTypes.FeatureIndicator.QUIC: + return FeatureIndicator.quic; } } diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx index c98bb0bc62..f1d5595b66 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx @@ -254,6 +254,7 @@ function getFeatureIndicatorLabel(indicator: FeatureIndicator) { ); case FeatureIndicator.udp2tcp: case FeatureIndicator.shadowsocks: + case FeatureIndicator.quic: return messages.pgettext('wireguard-settings-view', 'Obfuscation'); case FeatureIndicator.multihop: // TRANSLATORS: This refers to the multihop setting in the VPN settings view. This is 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 45ed498237..63ec8d0b9b 100644 --- a/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts +++ b/desktop/packages/mullvad-vpn/src/shared/daemon-rpc-types.ts @@ -232,6 +232,7 @@ export enum FeatureIndicator { lockdownMode, udp2tcp, shadowsocks, + quic, lanSharing, dnsContentBlockers, customDns, |