diff options
| author | Jonathan <jonathan@mullvad.net> | 2023-06-22 09:46:15 +0200 |
|---|---|---|
| committer | Jonathan <jonathan@mullvad.net> | 2023-06-29 15:00:08 +0200 |
| commit | 521d4e30fcd2bd52484ddb3d41ecbcfbf353b28f (patch) | |
| tree | d5c9296e25a90ce6c8d7391053a9c7ad40924c7d /mullvad-management-interface/src | |
| parent | 432b0016b2c7b27f0a254507b20a464a9f4cf111 (diff) | |
| download | mullvadvpn-521d4e30fcd2bd52484ddb3d41ecbcfbf353b28f.tar.xz mullvadvpn-521d4e30fcd2bd52484ddb3d41ecbcfbf353b28f.zip | |
Update changelog, sync naming in .proto update gui
Updates the changelog, syncs naming to be consistent inside the .proto
file with rust in regards to newly added message types for custom lists.
Update the gui so that it does not break when using a custom list
daemon. However does not let gui actually use custom lists, only has CLI
support.
Diffstat (limited to 'mullvad-management-interface/src')
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/relay_constraints.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-management-interface/src/types/conversions/relay_constraints.rs b/mullvad-management-interface/src/types/conversions/relay_constraints.rs index 2816be0e9b..8c1f89d368 100644 --- a/mullvad-management-interface/src/types/conversions/relay_constraints.rs +++ b/mullvad-management-interface/src/types/conversions/relay_constraints.rs @@ -484,12 +484,12 @@ impl From<mullvad_types::relay_constraints::LocationConstraint> for proto::Locat use mullvad_types::relay_constraints::LocationConstraint; match location { LocationConstraint::Location { location } => Self { - r#type: Some(proto::location_constraint::Type::Normal( + r#type: Some(proto::location_constraint::Type::Location( proto::RelayLocation::from(location), )), }, LocationConstraint::CustomList { list_id } => Self { - r#type: Some(proto::location_constraint::Type::Custom( + r#type: Some(proto::location_constraint::Type::CustomList( list_id.0.to_string(), )), }, @@ -505,7 +505,7 @@ impl TryFrom<proto::LocationConstraint> fn try_from(location: proto::LocationConstraint) -> Result<Self, Self::Error> { use mullvad_types::relay_constraints::LocationConstraint; match location.r#type { - Some(proto::location_constraint::Type::Normal(location)) => { + Some(proto::location_constraint::Type::Location(location)) => { let location = Constraint::< mullvad_types::relay_constraints::GeographicLocationConstraint, >::from(location); @@ -516,7 +516,7 @@ impl TryFrom<proto::LocationConstraint> } } } - Some(proto::location_constraint::Type::Custom(list_id)) => { + Some(proto::location_constraint::Type::CustomList(list_id)) => { let location = LocationConstraint::CustomList { list_id: Id::try_from(list_id.as_str()).map_err(|_| { FromProtobufTypeError::InvalidArgument("Id could not be parsed to a uuid") |