Fixes some VPN uninstallation issues #2820
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
github-actions
bot
added
the
bot: not in app board
diegoreymendez
removed
the
bot: not in app board
diegoreymendez
commented
May 29, 2024
Comment on lines
+223
to
+244
| private func subscribeToConfigurationChanges() { | ||
| notificationCenter.publisher(for: .NEVPNConfigurationChange) | ||
| .receive(on: DispatchQueue.main) | ||
| .sink { _ in | ||
| Task { @MainActor in | ||
| guard let manager = await self.manager else { | ||
| return | ||
| } | ||
|
|
||
| do { | ||
| try await manager.loadFromPreferences() | ||
|
|
||
| if manager.connection.status == .invalid { | ||
| self.clearInternalManager() | ||
| } | ||
| } catch { | ||
| self.clearInternalManager() | ||
| } | ||
| } | ||
| } | ||
| .store(in: &cancellables) | ||
| } |
There was a problem hiding this comment.
When the configuration changes we load it to make sure we have the latest. Or we clear it if it's become invalid.
diegoreymendez
commented
May 29, 2024
Comment on lines
+730
to
+736
| guard tunnelManager.connection.status != .invalid else { | ||
| // An invalid connection status means the VPN isn't really configured | ||
| // so we don't want to save changed because that would re-create the VPN | ||
| // configuration. | ||
| clearInternalManager() | ||
| return | ||
| } |
There was a problem hiding this comment.
This is the gist of the fix for the issues I was able to reproduce. The tunnel manager's connection becomes invalid if the configuration isn't saved.
In that case we don't really want to save changes, cos that'd prompt the user to create the configuration.
samsymons
approved these changes
May 29, 2024
There was a problem hiding this comment.
I tested this before and after on main and then this branch and confirmed this fixed the issue perfectly. I'm able to install/uninstall repeatedly with no issues, including when the VPN is connected/disconnected.
We should bring this change to the release branch, feel free to retarget it and merge.
|
Thanks for spotting that @samsymons - this was actually branched off the release branch but I forgot to change the target here, so you saved me some trouble there :) |
samsymons
added a commit
that referenced
this pull request
May 31, 2024
* main: Bump version to 1.90.0 (196) Revert "Add PIPAgent entitlement (#2821)" (#2823) Bump version to 1.90.0 (195) Bump version to 1.90.0 (194) Add PIPAgent entitlement (#2821) Fixes some VPN uninstallation issues (#2820) Bump version to 1.90.0 (193) Remove autofill survey (#2819) Remove autofill survey (#2819) Bump version to 1.90.0 (192) Set marketing version to 1.90.0 Update embedded files Privacy Pro survey support (#2816)
samsymons
added a commit
that referenced
this pull request
Jun 1, 2024
# By Elle Sullivan (10) and others # Via GitHub (6) and others * main: (42 commits) Update autoconsent to v10.9.0 (#2822) Bump version to 1.90.0 (196) Revert "Add PIPAgent entitlement (#2821)" (#2823) Bump version to 1.90.0 (195) Bump version to 1.90.0 (194) Add PIPAgent entitlement (#2821) Fixes some VPN uninstallation issues (#2820) Bump version to 1.90.0 (193) Remove autofill survey (#2819) Remove autofill survey (#2819) Bump version to 1.90.0 (192) Set marketing version to 1.90.0 Update embedded files Privacy Pro survey support (#2816) Update PeopleWhiz Broker Files to use hash id (#2814) Update BSK due to iOS changes. (#2776) Scroll address bar to caret when using arrows (#2799) Privacy Pro macOS quick follow ups (#2813) BSK bump for iOS RMF updates (#2798) Autofill engagement KPIs for pixel reporting (#2806) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons
added a commit
that referenced
this pull request
Jun 4, 2024
* main: Add optional "multiple" property to PageElement (#2827) Update BSK for iOS RMF changes (#2831) Bump version to 1.91.0 (197) Set marketing version to 1.91.0 Update embedded files DBP: Enable DBP Operations to Run When Device is Locked (#2797) Update autoconsent to v10.9.0 (#2822) Bump version to 1.90.0 (196) Revert "Add PIPAgent entitlement (#2821)" (#2823) Bump version to 1.90.0 (195) Bump version to 1.90.0 (194) Add PIPAgent entitlement (#2821) Fixes some VPN uninstallation issues (#2820) Bump version to 1.90.0 (193) Remove autofill survey (#2819)
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/1206580121312550/1207431594119528/f
Description
Fixes some VPN uninstallation issues in v1.90.0.
Testing
Try installing and uninstalling the VPN and make sure the uninstallation works.
Internal references:
Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation