Fix VPN bug: Nearest city breaks register requests #2589
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 tasks
graeme
commented
Apr 9, 2024
| @@ -80,7 +80,8 @@ final class VPNLocationViewModel: ObservableObject { | |||
|
|
|||
| func onCountryItemSelection(id: String, cityId: String? = nil) async { | |||
| DailyPixel.fire(pixel: .networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount) | |||
| let location = NetworkProtectionSelectedLocation(country: id, city: cityId) | |||
| let city = cityId == VPNCityItemModel.nearest.id ? nil : cityId | |||
There was a problem hiding this comment.
Fix for issue. Though, longterm, it would be better to rethink the id’s type. It’s not ideal right now using the string value like we are.
There was a problem hiding this comment.
I agree - can you scope up a follow up task to do this?
github-actions
bot
added
the
bot: not in app board
13 tasks
graeme
changed the title
diegoreymendez
requested changes
Apr 10, 2024
| @@ -80,7 +80,8 @@ final class VPNLocationViewModel: ObservableObject { | |||
|
|
|||
| func onCountryItemSelection(id: String, cityId: String? = nil) async { | |||
| DailyPixel.fire(pixel: .networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount) | |||
| let location = NetworkProtectionSelectedLocation(country: id, city: cityId) | |||
| let city = cityId == VPNCityItemModel.nearest.id ? nil : cityId | |||
There was a problem hiding this comment.
I agree - can you scope up a follow up task to do this?
graeme
force-pushed
the
graeme/fix-nearest-city-bug
branch
from
7c382c0
to
40bd2d0
Compare
github-actions
bot
removed
the
bot: not in app board
samsymons
added a commit
that referenced
this pull request
Apr 11, 2024
# By Dax the Duck (1) and Graeme Arthur (1) # Via Dax the Duck * release/1.83.0: Bump version to 1.83.0 (158) Fix VPN bug: Nearest city breaks register requests (#2589) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # LocalPackages/DataBrokerProtection/Package.swift # LocalPackages/NetworkProtectionMac/Package.swift # LocalPackages/SubscriptionUI/Package.swift
samsymons
added a commit
that referenced
this pull request
Apr 12, 2024
# By Dax the Duck (10) and others # Via GitHub (6) and others * main: (40 commits) Bump version to 1.83.0 (160) macOS VPN: Ask users to reboot if system extension was not uninstalled (#2603) macOS VPN: Ask users to reboot if system extension was not uninstalled (#2603) Fix popover not displayed reliably when VPN shortcut is unpinned (#2606) Automatically mark / close stale PRs (#2596) Update copy for DBP open button (#2586) Bump version to 1.83.0 (159) [Release PR] Fix lottie high Windowserver load (#2598) Bump version to 1.83.0 (158) BSK release 133.1.0 (#2597) Fix VPN bug: Nearest city breaks register requests (#2589) Fix lottie high Windowserver load (#2595) drop Downloads storyboard (#2556) Disable directory download (#2585) Add supported document types (#2581) Allow choosing downloads location in App Store builds (#2532) Fix Open Downloads not working (#2576) Update Privacy Dashboard URL on navigation commit (#2583) Percent-decode download filenames (#2584) Bump version to 1.83.0 (157) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/1203137811378537/1207044169885477/f
Description:
Due to a bug in the VPNLocationViewModel, we were using the string “Nearest” as a city ID which ended up making it to the
registerrequest. This only happens when we explicitly select Nearest rather than just selecting the country (which has the same effect).Steps to test this PR:
Expected
VPN connects to the nearest city in that country
Internal references:
Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation