diff options
Diffstat (limited to 'mullvad-management-interface')
| -rw-r--r-- | mullvad-management-interface/proto/management_interface.proto | 4 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/relay_constraints.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto index c77e5d571a..709079bee4 100644 --- a/mullvad-management-interface/proto/management_interface.proto +++ b/mullvad-management-interface/proto/management_interface.proto @@ -289,8 +289,8 @@ message BridgeSettings { message LocationConstraint { oneof type { - string custom = 1; - RelayLocation normal = 2; + string customList = 1; + RelayLocation location = 2; } } 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") |