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

Commit 0257003

Browse files
SlayterDevSlayterDev
authored
DBP waitlist removal (#3074)
Task/Issue URL: https://app.asana.com/0/1203581873609357/1206988388191940 Tech Design URL: CC: **Description**: This PR removes all DBP waitlist references and pixels **Steps to test this PR**: 1. Smoke test DBP feature <!-- Tagging instructions If this PR isn't ready to be merged for whatever reason it should be marked with the `DO NOT MERGE` label (particularly if it's a draft) If it's pending Product Review/PFR, please add the `Pending Product Review` label. If at any point it isn't actively being worked on/ready for review/otherwise moving forward (besides the above PR/PFR exception) strongly consider closing it (or not opening it in the first place). If you decide not to close it, make sure it's labelled to make it clear the PRs state and comment with more information. --> **Definition of Done**: * [ ] Does this PR satisfy our [Definition of Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)? --- ###### Internal references: [Pull Request Review Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f) [Software Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) [Technical Design Template](https://app.asana.com/0/59792373528535/184709971311943) [Pull Request Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
1 parent bdb1671 commit 0257003

File tree

42 files changed

+18
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+18
-1081
lines changed

‎Configuration/App/DBP/DuckDuckGoDBPAgent.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
4747
PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = macOS DBP Agent - Review
4848
PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = macOS DBP Agent - Release
4949

50-
FEATURE_FLAGS = FEEDBACK DBP
50+
FEATURE_FLAGS = FEEDBACK
5151

5252
GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1
5353
GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 $(inherited)

‎Configuration/App/DBP/DuckDuckGoDBPAgentAppStore.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
4949
PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent.review macos
5050
PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios.DBP.backgroundAgent macos
5151

52-
FEATURE_FLAGS = FEEDBACK DBP
52+
FEATURE_FLAGS = FEEDBACK
5353

5454
GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1
5555
GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DBP=1 NETP_SYSTEM_EXTENSION=1 DEBUG=1 CI=1 $(inherited)

‎Configuration/App/DuckDuckGo.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application
2626
CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
2727
CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
2828

29-
FEATURE_FLAGS = FEEDBACK SPARKLE DBP STRIPE
29+
FEATURE_FLAGS = FEEDBACK SPARKLE STRIPE
3030

3131
PRODUCT_NAME_PREFIX = DuckDuckGo
3232

‎Configuration/Common.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COMBINE_HIDPI_IMAGES = YES
2121
DEVELOPMENT_TEAM = HKE973VLUW
2222
DEVELOPMENT_TEAM[config=CI][sdk=*] =
2323

24-
FEATURE_FLAGS = FEEDBACK DBP
24+
FEATURE_FLAGS = FEEDBACK
2525

2626
GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = DEBUG=1 CI=1 $(inherited)
2727
GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = DEBUG=1 $(inherited)

‎Configuration/Tests/IntegrationTests.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
MACOSX_DEPLOYMENT_TARGET = 11.4
1919

20-
FEATURE_FLAGS = FEEDBACK DBP
20+
FEATURE_FLAGS = FEEDBACK
2121

2222
INFOPLIST_FILE = IntegrationTests/Info.plist
2323
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.Integration-Tests

‎Configuration/Tests/UnitTests.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
1919

20-
FEATURE_FLAGS = FEEDBACK DBP
20+
FEATURE_FLAGS = FEEDBACK
2121

2222
INFOPLIST_FILE = UnitTests/Info.plist
2323
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.macos.browser.DuckDuckGoTests

‎Configuration/Tests/UnitTestsAppStore.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "UnitTests.xcconfig"
1717
#include "../AppStore.xcconfig"
1818

19-
FEATURE_FLAGS = FEEDBACK DBP
19+
FEATURE_FLAGS = FEEDBACK
2020

2121
PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.DuckDuckGoTests
2222

‎DuckDuckGo.xcodeproj/project.pbxproj

-12
Original file line numberDiff line numberDiff line change
@@ -1322,8 +1322,6 @@
13221322
4B9DB0422A983B24000927DB /* WaitlistDialogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0182A983B24000927DB /* WaitlistDialogView.swift */; };
13231323
4B9DB0442A983B24000927DB /* WaitlistModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */; };
13241324
4B9DB0452A983B24000927DB /* WaitlistModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */; };
1325-
4B9DB0472A983B24000927DB /* WaitlistRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */; };
1326-
4B9DB0482A983B24000927DB /* WaitlistRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */; };
13271325
4B9DB04A2A983B24000927DB /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01C2A983B24000927DB /* NotificationService.swift */; };
13281326
4B9DB04B2A983B24000927DB /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB01C2A983B24000927DB /* NotificationService.swift */; };
13291327
4B9DB0542A983B55000927DB /* MockWaitlistStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9DB04F2A983B55000927DB /* MockWaitlistStorage.swift */; };
@@ -2542,8 +2540,6 @@
25422540
BBB881892C4029BA001247C6 /* BookmarkListTreeControllerSearchDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBB881872C4029BA001247C6 /* BookmarkListTreeControllerSearchDataSource.swift */; };
25432541
BBBEE1BF2C4FF63600035ABA /* SortBookmarksViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBEE1BE2C4FF63600035ABA /* SortBookmarksViewModelTests.swift */; };
25442542
BBBEE1C02C4FF63600035ABA /* SortBookmarksViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBBEE1BE2C4FF63600035ABA /* SortBookmarksViewModelTests.swift */; };
2545-
BBDFDC5A2B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */; };
2546-
BBDFDC5D2B2B8E2100F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */; };
25472543
BBFB727F2C48047C0088884C /* SortBookmarksViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFB727E2C48047C0088884C /* SortBookmarksViewModel.swift */; };
25482544
BBFB72802C48047C0088884C /* SortBookmarksViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFB727E2C48047C0088884C /* SortBookmarksViewModel.swift */; };
25492545
BBFF355D2C4AF26200DA3289 /* BookmarksSortModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBFF355C2C4AF26200DA3289 /* BookmarksSortModeTests.swift */; };
@@ -3382,7 +3378,6 @@
33823378
4B9DB0172A983B24000927DB /* JoinWaitlistView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinWaitlistView.swift; sourceTree = "<group>"; };
33833379
4B9DB0182A983B24000927DB /* WaitlistDialogView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistDialogView.swift; sourceTree = "<group>"; };
33843380
4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistModalViewController.swift; sourceTree = "<group>"; };
3385-
4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WaitlistRootView.swift; sourceTree = "<group>"; };
33863381
4B9DB01C2A983B24000927DB /* NotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
33873382
4B9DB04F2A983B55000927DB /* MockWaitlistStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockWaitlistStorage.swift; sourceTree = "<group>"; };
33883383
4B9DB0502A983B55000927DB /* MockNotificationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockNotificationService.swift; sourceTree = "<group>"; };
@@ -4229,7 +4224,6 @@
42294224
BB7B5F972C4ED73800BA4AF8 /* BookmarksSearchAndSortMetrics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksSearchAndSortMetrics.swift; sourceTree = "<group>"; };
42304225
BBB881872C4029BA001247C6 /* BookmarkListTreeControllerSearchDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkListTreeControllerSearchDataSource.swift; sourceTree = "<group>"; };
42314226
BBBEE1BE2C4FF63600035ABA /* SortBookmarksViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortBookmarksViewModelTests.swift; sourceTree = "<group>"; };
4232-
BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataBrokerProtectionExternalWaitlistPixels.swift; sourceTree = "<group>"; };
42334227
BBFB727E2C48047C0088884C /* SortBookmarksViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortBookmarksViewModel.swift; sourceTree = "<group>"; };
42344228
BBFF355C2C4AF26200DA3289 /* BookmarksSortModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksSortModeTests.swift; sourceTree = "<group>"; };
42354229
BD384AC72BBC821100EF3735 /* vpn-light-mode.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "vpn-light-mode.json"; sourceTree = "<group>"; };
@@ -4830,7 +4824,6 @@
48304824
316913252BD2B76F0051B46D /* DataBrokerPrerequisitesStatusVerifier.swift */,
48314825
3199C6FC2AF97367002A7BA1 /* DataBrokerProtectionAppEvents.swift */,
48324826
316850712AF3AD58009A2828 /* DataBrokerProtectionDebugMenu.swift */,
4833-
BBDFDC592B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift */,
48344827
3199C6F82AF94F5B002A7BA1 /* DataBrokerProtectionFeatureDisabler.swift */,
48354828
31C5FFB82AF64D120008A79F /* DataBrokerProtectionFeatureGatekeeper.swift */,
48364829
F1C70D782BFF50A400599292 /* DataBrokerProtectionLoginItemInterface.swift */,
@@ -5771,7 +5764,6 @@
57715764
4B9DB0182A983B24000927DB /* WaitlistDialogView.swift */,
57725765
4B9DB0192A983B24000927DB /* WaitlistModalViewController.swift */,
57735766
3168506C2AF3AD1C009A2828 /* WaitlistViewControllerPresenter.swift */,
5774-
4B9DB01A2A983B24000927DB /* WaitlistRootView.swift */,
57755767
4B520F622BA5573A006405C7 /* WaitlistThankYouView.swift */,
57765768
4B6B64832BA930420009FF9F /* WaitlistThankYouPromptPresenter.swift */,
57775769
);
@@ -10046,10 +10038,8 @@
1004610038
3706FAFD293F65D500E42796 /* DownloadsPopover.swift in Sources */,
1004710039
3706FAFE293F65D500E42796 /* SpacerNode.swift in Sources */,
1004810040
3706FB00293F65D500E42796 /* PasswordManagementCreditCardModel.swift in Sources */,
10049-
BBDFDC5D2B2B8E2100F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */,
1005010041
3706FB01293F65D500E42796 /* NSEventExtension.swift in Sources */,
1005110042
3706FB02293F65D500E42796 /* Onboarding.swift in Sources */,
10052-
4B9DB0482A983B24000927DB /* WaitlistRootView.swift in Sources */,
1005310043
3706FEB8293F6EFB00E42796 /* ConnectBitwardenView.swift in Sources */,
1005410044
1DFAB51E2A8982A600A0F7F6 /* SetExtension.swift in Sources */,
1005510045
B60C6F8E29B200AB007BFAA8 /* SavePanelAccessoryView.swift in Sources */,
@@ -11511,7 +11501,6 @@
1151111501
9F6434612BEC82B700D2D8A0 /* AttributionPixelHandler.swift in Sources */,
1151211502
B684592225C93BE000DC17B6 /* Publisher.asVoid.swift in Sources */,
1151311503
4B9DB01D2A983B24000927DB /* Waitlist.swift in Sources */,
11514-
BBDFDC5A2B2B8A0900F62D90 /* DataBrokerProtectionExternalWaitlistPixels.swift in Sources */,
1151511504
AAA0CC33252F181A0079BC96 /* NavigationButtonMenuDelegate.swift in Sources */,
1151611505
1DA84D2F2C11989D0011C80F /* Update.swift in Sources */,
1151711506
AAC30A2A268E239100D2D9CD /* CrashReport.swift in Sources */,
@@ -11910,7 +11899,6 @@
1191011899
AA7EB6E527E7D6DC00036718 /* AnimationView.swift in Sources */,
1191111900
8562599A269CA0A600EE44BC /* NSRectExtension.swift in Sources */,
1191211901
4B37EE5F2B4CFC3C00A89A61 /* HomePageRemoteMessagingStorage.swift in Sources */,
11913-
4B9DB0472A983B24000927DB /* WaitlistRootView.swift in Sources */,
1191411902
31F28C5128C8EEC500119F70 /* YoutubeOverlayUserScript.swift in Sources */,
1191511903
B6ABD0CA2BC03F610000EB69 /* SecurityScopedFileURLController.swift in Sources */,
1191611904
B6040856274B830F00680351 /* DictionaryExtension.swift in Sources */,

‎DuckDuckGo/Application/AppDelegate.swift

-10
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
106106

107107
// MARK: - DBP
108108

109-
#if DBP
110109
private lazy var dataBrokerProtectionSubscriptionEventHandler: DataBrokerProtectionSubscriptionEventHandler = {
111110
let authManager = DataBrokerAuthenticationManagerBuilder.buildAuthenticationManager(subscriptionManager: subscriptionManager)
112111
return DataBrokerProtectionSubscriptionEventHandler(featureDisabler: DataBrokerProtectionFeatureDisabler(),
113112
authenticationManager: authManager,
114113
pixelHandler: DataBrokerProtectionPixelsHandler())
115114
}()
116115

117-
#endif
118-
119116
private lazy var vpnRedditSessionWorkaround: VPNRedditSessionWorkaround = {
120117
let ipcClient = VPNControllerXPCClient.shared
121118
let statusReporter = DefaultNetworkProtectionStatusReporter(
@@ -374,13 +371,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
374371
NetworkProtectionAppEvents(featureGatekeeper: DefaultVPNFeatureGatekeeper(subscriptionManager: subscriptionManager)).applicationDidFinishLaunching()
375372
UNUserNotificationCenter.current().delegate = self
376373

377-
#if DBP
378374
dataBrokerProtectionSubscriptionEventHandler.registerForSubscriptionAccountManagerEvents()
379-
#endif
380-
381-
#if DBP
382375
DataBrokerProtectionAppEvents(featureGatekeeper: DefaultDataBrokerProtectionFeatureGatekeeper(accountManager: subscriptionManager.accountManager)).applicationDidFinishLaunching()
383-
#endif
384376

385377
setUpAutoClearHandler()
386378

@@ -427,11 +419,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
427419

428420
NetworkProtectionAppEvents(featureGatekeeper: DefaultVPNFeatureGatekeeper(subscriptionManager: subscriptionManager)).applicationDidBecomeActive()
429421

430-
#if DBP
431422
DataBrokerProtectionAppEvents(featureGatekeeper:
432423
DefaultDataBrokerProtectionFeatureGatekeeper(accountManager:
433424
subscriptionManager.accountManager)).applicationDidBecomeActive()
434-
#endif
435425

436426
subscriptionManager.refreshCachedSubscriptionAndEntitlements { isSubscriptionActive in
437427
if isSubscriptionActive {

‎DuckDuckGo/Application/URLEventHandler.swift

-7
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ import PixelKit
2323
import Subscription
2424
import NetworkProtectionUI
2525
import VPNAppLauncher
26-
27-
#if DBP
2826
import DataBrokerProtection
29-
#endif
3027

3128
// @MainActor
3229
final class URLEventHandler {
@@ -117,11 +114,9 @@ final class URLEventHandler {
117114
}
118115
}
119116

120-
#if DBP
121117
if url.scheme?.isDataBrokerProtectionScheme == true {
122118
handleDataBrokerProtectionURL(url)
123119
}
124-
#endif
125120

126121
DispatchQueue.main.async {
127122
if url.isFileURL && url.pathExtension == WebKitDownloadTask.downloadExtension {
@@ -146,7 +141,6 @@ final class URLEventHandler {
146141
}
147142
}
148143

149-
#if DBP
150144
/// Handles DBP URLs
151145
///
152146
private static func handleDataBrokerProtectionURL(_ url: URL) {
@@ -160,7 +154,6 @@ final class URLEventHandler {
160154
return
161155
}
162156
}
163-
#endif
164157
}
165158

166159
private extension String {

‎DuckDuckGo/Common/Extensions/BundleExtension.swift

-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ extension Bundle {
3838

3939
static let ipcAppGroup = "IPC_APP_GROUP"
4040

41-
#if DBP
4241
static let dbpBackgroundAgentBundleId = "DBP_BACKGROUND_AGENT_BUNDLE_ID"
4342
static let dbpBackgroundAgentProductName = "DBP_BACKGROUND_AGENT_PRODUCT_NAME"
44-
#endif
4543
}
4644

4745
var buildNumber: String {
@@ -87,7 +85,6 @@ extension Bundle {
8785
}
8886
#endif
8987

90-
#if DBP
9188
var dbpBackgroundAgentBundleId: String {
9289
guard let bundleID = object(forInfoDictionaryKey: Keys.dbpBackgroundAgentBundleId) as? String else {
9390
fatalError("Info.plist is missing \(Keys.dbpBackgroundAgentBundleId)")
@@ -101,7 +98,6 @@ extension Bundle {
10198
}
10299
return loginItemsURL.appendingPathComponent(productName + ".app")
103100
}
104-
#endif
105101

106102
func appGroup(bundle: BundleGroup) -> String {
107103
let appGroupName = bundle.appGroupKey

0 commit comments

Comments
 (0)