Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS VPN: Ask users to reboot if system extension was not uninstalled #2603

Merged

Conversation

diegoreymendez
Copy link
Contributor

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207056555335340/f

Description

We now ask again users to reboot if macOS requires it to complete installation of the system extension.

Testing

Try the VPN normally. I don't know of a way to enforce this error to come up, so it's mostly about reviewing the code changes.


Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

@diegoreymendez diegoreymendez self-assigned this Apr 11, 2024
@diegoreymendez diegoreymendez marked this pull request as ready for review April 11, 2024 16:51
@@ -408,7 +407,8 @@ enum NetworkProtectionPixelEvent: PixelKitEventV2 {
.networkProtectionClientFailedToParseRedeemResponse(let error),
.networkProtectionWireguardErrorCannotSetNetworkSettings(let error),
.networkProtectionRekeyFailure(let error),
.networkProtectionUnhandledError(_, _, let error):
.networkProtectionUnhandledError(_, _, let error),
.networkProtectionSystemExtensionActivationFailure(let error):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Restoring errors for this pixel.

@@ -54,7 +54,7 @@ extension NetworkExtensionController {

NetworkProtectionLastVersionRunStore(userDefaults: defaults).lastExtensionVersionRun = extensionVersion

try? await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
try await Task.sleep(nanoseconds: 300 * NSEC_PER_MSEC)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These errors should not be ignored as they're used to cancel tasks.

@diegoreymendez diegoreymendez merged commit ad5947f into main Apr 11, 2024
17 checks passed
@diegoreymendez diegoreymendez deleted the diego/ask-user-to-reboot-if-system-extension-requires-it branch April 11, 2024 21:51
diegoreymendez added a commit that referenced this pull request Apr 11, 2024
#2603)

Task/Issue URL:
https://app.asana.com/0/1199230911884351/1207056555335340/f

## Description

We now ask again users to reboot if macOS requires it to complete
installation of the system extension.
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants