Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit 3aad126

Browse files
authored
VPN clean-up (#3502)
Task/Issue URL: https://app.asana.com/0/1207603085593419/1208654487861283/f Tech Design URL: CC: Description: This PR cleans up some VPN code, namely some pixels from events that no longer exist.
1 parent ab52710 commit 3aad126

File tree

5 files changed

+3
-27
lines changed

5 files changed

+3
-27
lines changed

Core/PixelEvent.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,6 @@ extension Pixel {
412412
case networkProtectionClientFailedToParseRegisteredServersResponse
413413
case networkProtectionClientFailedToFetchLocations
414414
case networkProtectionClientFailedToParseLocationsResponse
415-
case networkProtectionClientFailedToEncodeRedeemRequest
416-
case networkProtectionClientInvalidInviteCode
417-
case networkProtectionClientFailedToRedeemInviteCode
418-
case networkProtectionClientFailedToParseRedeemResponse
419415
case networkProtectionClientInvalidAuthToken
420416

421417
case networkProtectionKeychainErrorFailedToCastKeychainValueToData
@@ -1239,10 +1235,6 @@ extension Pixel.Event {
12391235
case .networkProtectionClientFailedToFetchLocations: return "m_netp_backend_api_error_failed_to_fetch_locations"
12401236
case .networkProtectionClientFailedToParseLocationsResponse:
12411237
return "m_netp_backend_api_error_parsing_locations_response_failed"
1242-
case .networkProtectionClientFailedToEncodeRedeemRequest: return "m_netp_backend_api_error_encoding_redeem_request_body_failed"
1243-
case .networkProtectionClientInvalidInviteCode: return "m_netp_backend_api_error_invalid_invite_code"
1244-
case .networkProtectionClientFailedToRedeemInviteCode: return "m_netp_backend_api_error_failed_to_redeem_invite_code"
1245-
case .networkProtectionClientFailedToParseRedeemResponse: return "m_netp_backend_api_error_parsing_redeem_response_failed"
12461238
case .networkProtectionClientInvalidAuthToken: return "m_netp_backend_api_error_invalid_auth_token"
12471239
case .networkProtectionKeychainErrorFailedToCastKeychainValueToData: return "m_netp_keychain_error_failed_to_cast_keychain_value_to_data"
12481240
case .networkProtectionKeychainReadError: return "m_netp_keychain_error_read_failed"

DuckDuckGo.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10986,7 +10986,7 @@
1098610986
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
1098710987
requirement = {
1098810988
kind = exactVersion;
10989-
version = 204.0.0;
10989+
version = 205.0.0;
1099010990
};
1099110991
};
1099210992
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DuckDuckGo/EventMapping+NetworkProtectionError.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ extension EventMapping where Event == NetworkProtectionError {
3636
case .failedToParseLocationListResponse(let error):
3737
pixelEvent = .networkProtectionClientFailedToParseLocationsResponse
3838
pixelError = error
39-
case .failedToEncodeRedeemRequest:
40-
pixelEvent = .networkProtectionClientFailedToEncodeRedeemRequest
41-
case .invalidInviteCode:
42-
pixelEvent = .networkProtectionClientInvalidInviteCode
43-
case .failedToRedeemInviteCode(let error):
44-
pixelEvent = .networkProtectionClientFailedToRedeemInviteCode
45-
pixelError = error
46-
case .failedToParseRedeemResponse(let error):
47-
pixelEvent = .networkProtectionClientFailedToParseRedeemResponse
48-
pixelError = error
4939
case .invalidAuthToken:
5040
pixelEvent = .networkProtectionClientInvalidAuthToken
5141
case .failedToCastKeychainValueToData(field: let field):
@@ -85,7 +75,6 @@ extension EventMapping where Event == NetworkProtectionError {
8575
.wireGuardInvalidState,
8676
.wireGuardDnsResolution,
8777
.wireGuardSetNetworkSettings,
88-
.failedToRetrieveAuthToken,
8978
.failedToFetchServerStatus,
9079
.failedToParseServerStatusResponse:
9180
pixelEvent = .networkProtectionUnhandledError

PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,6 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
316316
pixelError = eventError
317317
case .failedToParseRegisteredServersResponse:
318318
pixelEvent = .networkProtectionClientFailedToParseRegisteredServersResponse
319-
case .failedToEncodeRedeemRequest, .invalidInviteCode, .failedToRedeemInviteCode, .failedToParseRedeemResponse:
320-
pixelEvent = .networkProtectionUnhandledError
321-
// Should never be sent from the extension
322319
case .invalidAuthToken:
323320
pixelEvent = .networkProtectionClientInvalidAuthToken
324321
case .serverListInconsistency:
@@ -366,8 +363,6 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
366363
params[PixelParameters.function] = function
367364
params[PixelParameters.line] = String(line)
368365
pixelError = error
369-
case .failedToRetrieveAuthToken:
370-
return
371366
case .failedToFetchLocationList:
372367
return
373368
case .failedToParseLocationListResponse:

0 commit comments

Comments
 (0)