NetP x Subscription Clean-up #709
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
quanganhdo
commented
Mar 11, 2024
| @@ -799,7 +799,7 @@ open class PacketTunnelProvider: NEPacketTunnelProvider { | |||
| ) | |||
| } catch { | |||
| if isSubscriptionEnabled, let error = error as? NetworkProtectionError, case .vpnAccessRevoked = error { | |||
| await handleInvalidEntitlement(attemptsShutdown: false) | |||
| await handleInvalidEntitlement(attemptsShutdown: true) | |||
There was a problem hiding this comment.
Initially I thought there's no need to attempt a shutdown; but this is necessary when the app tries to automatically reconnect for whatever reason.
graeme
reviewed
Mar 13, 2024
Sources/NetworkProtection/KeyManagement/NetworkProtectionTokenStore.swift
Outdated
Show resolved
Hide resolved
graeme
approved these changes
Mar 13, 2024
# Conflicts: # Sources/Subscription/AccountManager.swift
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
* main: Update wireguard-apple to 1.1.3. (#729) Improves VPN pixel info and adds tests (#732) Reset Cache on Subscription Purchase & Restore (#719) Revert "Remove Autoconsent subfeature (#697)" (#730) Stub objects for Bookmarks sync (#713) make history entry weak to avoid retain cycle (#727) NetP x Subscription Clean-up (#709) Moves AppLaunching out of BSK as it's macOS only (#721)
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.
Please review the release process for BrowserServicesKit here.
Required:
Task/Issue URL: https://app.asana.com/0/0/1206470585910126/f
iOS PR: duckduckgo/iOS#2565
macOS PR: duckduckgo/macos-browser#2363
What kind of version bump will this require?: Major
Optional:
Tech Design URL:
CC:
Description:
This PR addresses some tech debts in recent NetP x Subscription work:
Steps to test this PR:
OS Testing:
Internal references:
Software Engineering Expectations
Technical Design Template