summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-04-24 13:25:33 +0200
committerAndrej Mihajlov <and@mullvad.net>2020-04-24 19:26:56 +0200
commitc7a0394ff4b0c1119e23aabbc68e08764ac334ca (patch)
tree2e83501fd5128a193b492b20b76b148290cef011
parentb41a0b2225411698955b6f0243c0a47eaeea0a02 (diff)
downloadmullvadvpn-c7a0394ff4b0c1119e23aabbc68e08764ac334ca.tar.xz
mullvadvpn-c7a0394ff4b0c1119e23aabbc68e08764ac334ca.zip
Respect includeInCountry when handling country constraints
See: https://github.com/mullvad/mullvadvpn-app/blob/2489837d85d914852cc0740987d9b6ab4f26d256/mullvad-daemon/src/relays.rs#L544
-rw-r--r--ios/MullvadVPN/RelaySelector.swift3
1 files changed, 2 insertions, 1 deletions
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 &&