diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-04-24 23:30:12 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-04-24 23:30:12 +0200 |
| commit | f9573c6f0360a6dcd0e334285e2ae91120234100 (patch) | |
| tree | d3b6c014b2f6b63fa123009157f0ba9ba14551e3 | |
| parent | b41a0b2225411698955b6f0243c0a47eaeea0a02 (diff) | |
| parent | cd98f677c28da2e050a405b7b30235b696bed038 (diff) | |
| download | mullvadvpn-f9573c6f0360a6dcd0e334285e2ae91120234100.tar.xz mullvadvpn-f9573c6f0360a6dcd0e334285e2ae91120234100.zip | |
Merge branch 'respect-include-in-country'
| -rw-r--r-- | ios/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | ios/MullvadVPN/RelaySelector.swift | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index 52f10f0ab0..3516762a4d 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -24,6 +24,11 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Fixed +- Fix relay selection for country wide constraints by respecting the `include_in_country` + parameter. + +## [2020.2] - 2020-04-16 +### Fixed - Fix "invalid account" error that was mistakenly reported as "network error" during log in. - Fix parsing of pre-formatted account numbers when pasting from pasteboard on login screen. diff --git a/ios/MullvadVPN/RelaySelector.swift b/ios/MullvadVPN/RelaySelector.swift index e5504d6ce2..716a62fc9a 100644 --- a/ios/MullvadVPN/RelaySelector.swift +++ b/ios/MullvadVPN/RelaySelector.swift @@ -74,7 +74,8 @@ struct RelaySelector { case .only(let relayConstraint): switch relayConstraint { case .country(let countryCode): - return relayWithLocation.location.countryCode == countryCode + return relayWithLocation.location.countryCode == countryCode && + relayWithLocation.relay.includeInCountry case .city(let countryCode, let cityCode): return relayWithLocation.location.countryCode == countryCode && |