Skip to content

Commit

Permalink
Update BSK ref
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayoy
ayoy committed Feb 3, 2025
2 parents b855625 + a1a71e8 commit b2739b9
Show file tree
Hide file tree
Showing 156 changed files with 1,118 additions and 1,208 deletions.
42 changes: 42 additions & 0 deletions DuckDuckGo-macOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,10 @@
7B0694982B6E980F00FA4DBA /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
7B09CBA92BA4BE8100CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
7B0A6DFA2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A6DF82D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift */; };
7B0A6DFB2D47CCDF00FDFDC2 /* ExcludedApps.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B0A6DF72D47CCDF00FDFDC2 /* ExcludedApps.storyboard */; };
7B0A6DFC2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0A6DF82D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift */; };
7B0A6DFD2D47CCDF00FDFDC2 /* ExcludedApps.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B0A6DF72D47CCDF00FDFDC2 /* ExcludedApps.storyboard */; };
7B1459552B7D438F00047F2C /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
7B1459572B7D43E500047F2C /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B1459562B7D43E500047F2C /* NetworkProtectionProxy */; };
7B1E819E27C8874900FF0E60 /* ContentOverlayPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */; };
Expand All @@ -1862,6 +1866,8 @@
7B31FD8C2AD125620086AA24 /* NetworkProtectionIPC in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31FD8B2AD125620086AA24 /* NetworkProtectionIPC */; };
7B3618C22ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B3618C12ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift */; };
7B37C7A52BAA32A50062546A /* Subscription in Frameworks */ = {isa = PBXBuildFile; productRef = 7B37C7A42BAA32A50062546A /* Subscription */; };
7B3A16422D4B7A9600D4C869 /* AppInfoRetriever in Frameworks */ = {isa = PBXBuildFile; productRef = 7B3A16412D4B7A9600D4C869 /* AppInfoRetriever */; };
7B3A16442D4B7A9C00D4C869 /* AppInfoRetriever in Frameworks */ = {isa = PBXBuildFile; productRef = 7B3A16432D4B7A9C00D4C869 /* AppInfoRetriever */; };
7B430EA12A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */; };
7B430EA22A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */; };
7B4C5CF52BE51D640007A164 /* VPNUninstallerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4C5CF42BE51D640007A164 /* VPNUninstallerTests.swift */; };
Expand Down Expand Up @@ -1900,6 +1906,8 @@
7B8FDD242CDD88D300720907 /* FeatureFlags in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8FDD232CDD88D300720907 /* FeatureFlags */; };
7B8FDD262CDD88D900720907 /* FeatureFlags in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8FDD252CDD88D900720907 /* FeatureFlags */; };
7B934C412A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */; };
7B93A68B2D4A5AF200E9FFC1 /* ExcludedAppsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B93A68A2D4A5AEC00E9FFC1 /* ExcludedAppsModel.swift */; };
7B93A68C2D4A5AF200E9FFC1 /* ExcludedAppsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B93A68A2D4A5AEC00E9FFC1 /* ExcludedAppsModel.swift */; };
7B97CD592B7E0B57004FEF43 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD582B7E0B57004FEF43 /* NetworkProtectionProxy */; };
7B97CD5B2B7E0B85004FEF43 /* Common in Frameworks */ = {isa = PBXBuildFile; productRef = 7B97CD5A2B7E0B85004FEF43 /* Common */; };
7B97CD5C2B7E0BBB004FEF43 /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85C6A29525CC1FFD00EEB5F1 /* UserDefaultsWrapper.swift */; };
Expand Down Expand Up @@ -4247,6 +4255,8 @@
7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNProxyLauncher.swift; sourceTree = "<group>"; };
7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionPixelEventTests.swift; sourceTree = "<group>"; };
7B0A6DF72D47CCDF00FDFDC2 /* ExcludedApps.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ExcludedApps.storyboard; sourceTree = "<group>"; };
7B0A6DF82D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExcludedAppsViewController.swift; sourceTree = "<group>"; };
7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayPopover.swift; sourceTree = "<group>"; };
7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ContentOverlay.storyboard; sourceTree = "<group>"; };
7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayViewController.swift; sourceTree = "<group>"; };
Expand All @@ -4255,6 +4265,7 @@
7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionAppEvents.swift; sourceTree = "<group>"; };
7B2E52242A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionAgentNotificationsPresenter.swift; sourceTree = "<group>"; };
7B3618C12ADE75C8000D6154 /* NetworkProtectionNavBarPopoverManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionNavBarPopoverManager.swift; sourceTree = "<group>"; };
7B3A16402D4B798000D4C869 /* AppInfoRetriever */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppInfoRetriever; sourceTree = "<group>"; };
7B430EA02A71411A00BAC4A1 /* NetworkProtectionSimulateFailureMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionSimulateFailureMenu.swift; sourceTree = "<group>"; };
7B4C5CF42BE51D640007A164 /* VPNUninstallerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNUninstallerTests.swift; sourceTree = "<group>"; };
7B4CE8DA26F02108009134B1 /* UI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -4280,6 +4291,7 @@
7B9167A82C09E88800322310 /* AppLauncher */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppLauncher; sourceTree = "<group>"; };
7B934C3D2A866CFF00FC8F9C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
7B934C402A866DD400FC8F9C /* UserDefaults+NetworkProtectionShared.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UserDefaults+NetworkProtectionShared.swift"; sourceTree = "<group>"; };
7B93A68A2D4A5AEC00E9FFC1 /* ExcludedAppsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExcludedAppsModel.swift; sourceTree = "<group>"; };
7BA7CC0B2AD11D1E0042E5CE /* DuckDuckGoVPNAppStore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DuckDuckGoVPNAppStore.xcconfig; sourceTree = "<group>"; };
7BA7CC0C2AD11D1E0042E5CE /* DuckDuckGoVPN.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DuckDuckGoVPN.xcconfig; sourceTree = "<group>"; };
7BA7CC0E2AD11DC80042E5CE /* DuckDuckGoVPNAppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DuckDuckGoVPNAppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5196,6 +5208,7 @@
3706FCAA293F65D500E42796 /* UserScript in Frameworks */,
5641734D2CFE169400F4B716 /* PixelExperimentKit in Frameworks */,
85E2BBD02B8F534A00DBEC7A /* History in Frameworks */,
7B3A16422D4B7A9600D4C869 /* AppInfoRetriever in Frameworks */,
4BF97AD52B43C43F00EB4240 /* NetworkProtection in Frameworks */,
4B94B79B2D4731F00014AAB8 /* SyncUI-macOS in Frameworks */,
560EB9372C78974C0080DBC8 /* Onboarding in Frameworks */,
Expand Down Expand Up @@ -5454,6 +5467,7 @@
CBC83E3629B63D380008E19C /* Configuration in Frameworks */,
7B31FD8C2AD125620086AA24 /* NetworkProtectionIPC in Frameworks */,
371209232C232E66003ADF3D /* RemoteMessaging in Frameworks */,
7B3A16442D4B7A9C00D4C869 /* AppInfoRetriever in Frameworks */,
37269EFB2B332F9E005E8E46 /* Common in Frameworks */,
AA06B6B72672AF8100F541C5 /* Sparkle in Frameworks */,
37EE81412D00DBC40068034A /* WebKitExtensions in Frameworks */,
Expand Down Expand Up @@ -6190,6 +6204,7 @@
378E279C2970217400FCADA2 /* LocalPackages */ = {
isa = PBXGroup;
children = (
7B3A16402D4B798000D4C869 /* AppInfoRetriever */,
9D9DE5712C63A96400D20B15 /* AppKitExtensions */,
7B9167A82C09E88800322310 /* AppLauncher */,
378E279D2970217400FCADA2 /* BuildToolPlugins */,
Expand Down Expand Up @@ -6552,6 +6567,7 @@
4B4D60572A0B29FA00BCD287 /* AppAndExtensionTargets */,
4B4D60602A0B29FA00BCD287 /* AppTargets */,
4B4D60742A0B29FA00BCD287 /* NetworkExtensionTargets */,
7B0A6DF92D47CCDF00FDFDC2 /* ExcludedApps */,
7B5A236D2C46A0DA007213AC /* ExcludedDomains */,
);
path = NetworkProtection;
Expand Down Expand Up @@ -7353,6 +7369,16 @@
path = DuckSchemeHandler;
sourceTree = "<group>";
};
7B0A6DF92D47CCDF00FDFDC2 /* ExcludedApps */ = {
isa = PBXGroup;
children = (
7B0A6DF72D47CCDF00FDFDC2 /* ExcludedApps.storyboard */,
7B0A6DF82D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift */,
7B93A68A2D4A5AEC00E9FFC1 /* ExcludedAppsModel.swift */,
);
path = ExcludedApps;
sourceTree = "<group>";
};
7B1E819A27C8874900FF0E60 /* Autofill */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -10236,6 +10262,7 @@
379230952D3852860019E130 /* HistoryView */,
4B94B79A2D4731F00014AAB8 /* SyncUI-macOS */,
7BECF1AA2D4905E000C1D691 /* PreferencesUI-macOS */,
7B3A16412D4B7A9600D4C869 /* AppInfoRetriever */,
);
productName = DuckDuckGo;
productReference = 3706FD05293F65D500E42796 /* DuckDuckGo App Store.app */;
Expand Down Expand Up @@ -10723,6 +10750,7 @@
379230932D38527E0019E130 /* HistoryView */,
4B94B7982D4731E80014AAB8 /* SyncUI-macOS */,
7BECF1A82D4905DA00C1D691 /* PreferencesUI-macOS */,
7B3A16432D4B7A9C00D4C869 /* AppInfoRetriever */,
);
productName = DuckDuckGo;
productReference = AA585D7E248FD31100E9A3E2 /* DuckDuckGo.app */;
Expand Down Expand Up @@ -10979,6 +11007,7 @@
3706FCE7293F65D500E42796 /* shield-dot-mouse-over.json in Resources */,
BD384ACB2BBC821B00EF3735 /* vpn-dark-mode.json in Resources */,
3706FCEA293F65D500E42796 /* PasswordManager.storyboard in Resources */,
7B0A6DFB2D47CCDF00FDFDC2 /* ExcludedApps.storyboard in Resources */,
BD384ACC2BBC821B00EF3735 /* vpn-light-mode.json in Resources */,
3706FCEB293F65D500E42796 /* dark-flame-mouse-over.json in Resources */,
3706FCEC293F65D500E42796 /* flame-mouse-over.json in Resources */,
Expand Down Expand Up @@ -11182,6 +11211,7 @@
AA7EB6E927E880A600036718 /* shield-dot-mouse-over.json in Resources */,
BD384AC92BBC821A00EF3735 /* vpn-dark-mode.json in Resources */,
85625994269C8F9600EE44BC /* PasswordManager.storyboard in Resources */,
7B0A6DFD2D47CCDF00FDFDC2 /* ExcludedApps.storyboard in Resources */,
BD384ACA2BBC821A00EF3735 /* vpn-light-mode.json in Resources */,
AA7EB6E327E7D05500036718 /* dark-flame-mouse-over.json in Resources */,
AA7EB6E227E7D05500036718 /* flame-mouse-over.json in Resources */,
Expand Down Expand Up @@ -11985,6 +12015,7 @@
F18826932BC0105900D9AC4F /* PixelDataStore.swift in Sources */,
7BBD45B22A691AB500C83CA9 /* NetworkProtectionDebugUtilities.swift in Sources */,
3706FB87293F65D500E42796 /* ProcessExtension.swift in Sources */,
7B0A6DFA2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */,
F18826812BBEB58100D9AC4F /* PrivacyProPixel.swift in Sources */,
31521AC42CC01BC700248E6F /* AIChatTabOpener.swift in Sources */,
3706FB88293F65D500E42796 /* PermissionAuthorizationQuery.swift in Sources */,
Expand Down Expand Up @@ -12074,6 +12105,7 @@
3706FBB6293F65D500E42796 /* ChromiumPreferences.swift in Sources */,
1D6860542D370A40006FC53E /* WebExtensionPathsCache.swift in Sources */,
85B49AFB2CD1B7C5007FAA2A /* SystemInfo.swift in Sources */,
7B93A68B2D4A5AF200E9FFC1 /* ExcludedAppsModel.swift in Sources */,
3706FBB7293F65D500E42796 /* FirePopoverViewController.swift in Sources */,
3706FBB8293F65D500E42796 /* SavePaymentMethodPopover.swift in Sources */,
B6CC266D2BAD9CD800F53F8D /* FileProgressPresenter.swift in Sources */,
Expand Down Expand Up @@ -13647,6 +13679,7 @@
AA5FA69D275F945C00DCE9C9 /* FaviconStore.swift in Sources */,
4B9DB0352A983B24000927DB /* WaitlistTermsAndConditionsView.swift in Sources */,
AAB8203C26B2DE0D00788AC3 /* SuggestionListCharacteristics.swift in Sources */,
7B93A68C2D4A5AF200E9FFC1 /* ExcludedAppsModel.swift in Sources */,
3173072A2CD248EA00C492AB /* AutofillToolbarOnboardingViewController.swift in Sources */,
4B6785472AA8DE68008A5004 /* VPNUninstaller.swift in Sources */,
4B9292D42667123700AD2C21 /* BookmarkListViewController.swift in Sources */,
Expand Down Expand Up @@ -14113,6 +14146,7 @@
C126B35A2C820924005DC2A3 /* FreemiumDebugMenu.swift in Sources */,
B6A9E46B2614618A0067D1B9 /* OperatingSystemVersionExtension.swift in Sources */,
4BDFA4AE27BF19E500648192 /* ToggleableScrollView.swift in Sources */,
7B0A6DFC2D47CCDF00FDFDC2 /* ExcludedAppsViewController.swift in Sources */,
1D36F4242A3B85C50052B527 /* TabCleanupPreparer.swift in Sources */,
B6ABD0CE2BC042CE0000EB69 /* NSURL+sandboxExtensionRetainCount.m in Sources */,
4B4D60DF2A0C875F00BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
Expand Down Expand Up @@ -16184,6 +16218,14 @@
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = Subscription;
};
7B3A16412D4B7A9600D4C869 /* AppInfoRetriever */ = {
isa = XCSwiftPackageProductDependency;
productName = AppInfoRetriever;
};
7B3A16432D4B7A9C00D4C869 /* AppInfoRetriever */ = {
isa = XCSwiftPackageProductDependency;
productName = AppInfoRetriever;
};
7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */ = {
isa = XCSwiftPackageProductDependency;
productName = NetworkProtectionUI;
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo-macOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"branch" : "dominik/htmlntp-recent-activity",
"revision" : "045b2b69fed3b4bdcc6d093edf25f74899392418"
"revision" : "6db339cb036fcfa212bfd00eaef20ca0e6bff774"
}
},
{
"identity" : "content-scope-scripts",
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/content-scope-scripts",
"state" : {
"branch" : "pr-releases/pr-1419",
"revision" : "bea00136b648496edee3f073be759ffc106379e7"
"branch" : "pr-releases/pr-1459",
"revision" : "3191584bfb6efdb68f2290db8b26285a4f1d2a48"
}
},
{
Expand Down
6 changes: 6 additions & 0 deletions DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ extension UserText {

static let vpnSettingsManageExclusionsButtonTitle = NSLocalizedString("vpn.setting.exclusions.manage.button.title", value: "Manage...", comment: "Title for the button to manage exclusions")

static let vpnNoExclusionsFoundText = NSLocalizedString("vpn.no.exclusions.found.text", value: "None", comment: "Text shown in VPN settings when no exclusions are configured")

// MARK: - Excluded Apps

static let vpnExcludedAppsAddApp = NSLocalizedString("vpn.excluded.apps.add.app", value: "Add Application", comment: "Add Application button for the excluded apps view")

// MARK: - Excluded Domains

static let vpnExcludedDomainsDescription = NSLocalizedString("vpn.setting.excluded.domains.description", value: "Excluded websites will bypass the VPN.", comment: "Excluded Sites description")
Expand Down
12 changes: 0 additions & 12 deletions DuckDuckGo/DBP/DBPHomeViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,18 +168,6 @@ final class DBPHomeViewController: NSViewController {
}
}

extension DBPHomeViewController: DataBrokerProtectionInviteDialogsViewModelDelegate {
func dataBrokerProtectionInviteDialogsViewModelDidReedemSuccessfully(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
presentedWindowController?.window?.close()
presentedWindowController = nil
setupUIWithCurrentStatus()
}

func dataBrokerProtectionInviteDialogsViewModelDidCancel(_ viewModel: DataBrokerProtectionInviteDialogsViewModel) {
closeUI()
}
}

// MARK: - Error UI

extension DBPHomeViewController {
Expand Down
Loading

0 comments on commit b2739b9

Please sign in to comment.