diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-12-13 12:57:53 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-12-13 12:57:53 +0100 |
| commit | c53c07dcd8057533e690e062c0aafc6547992dfa (patch) | |
| tree | 426f2bd86f6a6b504a0028ad4ee442f8db548869 | |
| parent | 533fc9c8341f26f5729e957ba63d5181f34d16fa (diff) | |
| parent | 0e3a1139d4c1322b674495c19bb2ae8955f1ee70 (diff) | |
| download | mullvadvpn-c53c07dcd8057533e690e062c0aafc6547992dfa.tar.xz mullvadvpn-c53c07dcd8057533e690e062c0aafc6547992dfa.zip | |
Merge branch 'add-city-active-flag'
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 1 | ||||
| -rw-r--r-- | mullvad-types/src/relay_list.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 8ebbf49171..db443f2ea6 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -267,6 +267,7 @@ impl RelaySelector { let country_name = country.name.clone(); let country_code = country.code.clone(); for city in &mut country.cities { + city.has_active_relays = !city.relays.is_empty(); let city_name = city.name.clone(); let city_code = city.code.clone(); let position = city.position; diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs index 829665efa3..4eed3985d9 100644 --- a/mullvad-types/src/relay_list.rs +++ b/mullvad-types/src/relay_list.rs @@ -22,6 +22,7 @@ pub struct RelayListCity { pub name: String, pub code: CityCode, pub position: [f64; 2], + #[serde(skip_deserializing)] pub has_active_relays: bool, #[serde(skip_serializing_if = "Vec::is_empty", default)] pub relays: Vec<Relay>, } |