Fix VPN toggle failures #858
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
This was referenced Jun 21, 2024
diegoreymendez
commented
Jun 21, 2024
| @@ -88,7 +88,9 @@ public class ConnectionErrorObserverThroughSession: ConnectionErrorObserver { | |||
|
|
|||
| private func handleStatusChangeNotification(_ notification: Notification) { | |||
| do { | |||
| guard let session = ConnectionSessionUtilities.session(from: notification) else { | |||
| guard let session = ConnectionSessionUtilities.session(from: notification), | |||
| session.status == .disconnected else { | |||
There was a problem hiding this comment.
We don't need error information if the VPN is connected.
diegoreymendez
commented
Jun 21, 2024
| @@ -98,6 +98,10 @@ public class ConnectionServerInfoObserverThroughSession: ConnectionServerInfoObs | |||
| // MARK: - Obtaining the NetP VPN status | |||
|
|
|||
| private func updateServerInfo(session: NETunnelProviderSession) async { | |||
| guard session.status == .connected else { | |||
There was a problem hiding this comment.
We only need server info if the VPN is connected.
diegoreymendez
commented
Jun 21, 2024
| @@ -99,7 +99,9 @@ public class DataVolumeObserverThroughSession: DataVolumeObserver { | |||
|
|
|||
| private func updateDataVolume() { | |||
| Task { | |||
| guard let session = await tunnelSessionProvider.activeSession() else { | |||
| guard let session = await tunnelSessionProvider.activeSession(), | |||
| session.status == .connected else { | |||
There was a problem hiding this comment.
We only need data volume if the VPN is connected.
aataraxiaa
approved these changes
Jun 21, 2024
diegoreymendez
added a commit
to duckduckgo/macos-browser
that referenced
this pull request
Jun 21, 2024
Task/Issue URL: https://app.asana.com/0/1207603085593419/1207629954356116/f iOS PR: duckduckgo/iOS#2979 BSK PR: duckduckgo/BrowserServicesKit#858 ## Description The VPN toggle is sometimes failing silently, apparently due to a race condition created by calls to `sendProviderMessage` while the VPN is starting up. This PR changes our logic to limit when those calls are made, since none of them make sense to call when the VPN is connecting.
diegoreymendez
added a commit
to duckduckgo/iOS
that referenced
this pull request
Jun 21, 2024
Task/Issue URL: https://app.asana.com/0/1207603085593419/1207629954356116/f macOS PR: duckduckgo/macos-browser#2892 BSK PR: duckduckgo/BrowserServicesKit#858 ## Description The VPN toggle is sometimes failing silently, apparently due to a race condition created by calls to `sendProviderMessage` while the VPN is starting up. This PR changes our logic to limit when those calls are made, since none of them make sense to call when the VPN is connecting.
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/1207603085593419/1207629954356116/f
iOS PR: duckduckgo/iOS#2979
macOS PR: duckduckgo/macos-browser#2892
What kind of version bump will this require?: Patch
Description
The VPN toggle is sometimes failing silently, apparently due to a race condition created by calls to
sendProviderMessagewhile the VPN is starting up.This PR changes our logic to limit when those calls are made, since none of them make sense to call when the VPN is connecting.
Testing
See platform-specific PRs for instructions.
Internal references:
Software Engineering Expectations
Technical Design Template