From 030b63303a11fd11cf8c0a4db8f0bb4f5603bd5d Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Fri, 30 Aug 2024 14:57:56 -0700 Subject: [PATCH 1/5] Set APIRequest user agent. --- .../NetworkProtectionPacketTunnelProvider.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift index 56a504e774..71069a06fe 100644 --- a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift +++ b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift @@ -318,6 +318,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider { } @objc init() { + APIRequest.Headers.setUserAgent(DefaultUserAgentManager.duckDuckGoUserAgent) let settings = VPNSettings(defaults: .networkProtectionGroupDefaults) From 7f7579c07079f3f961f035053d71670bbc1c481f Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Sun, 1 Sep 2024 16:49:17 -0700 Subject: [PATCH 2/5] Set BSK branch. --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 5cc9ca97eb..85bba2f2d9 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10649,8 +10649,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 190.0.0; + branch = "sam/set-vpn-user-agent"; + kind = branch; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 598a4cfc0a..429eb98c78 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "ac53011582abcca4aefd66f15308332273eecb49", - "version" : "190.0.0" + "branch" : "sam/set-vpn-user-agent", + "revision" : "4d3e43bcd624c0c9f4ac6ffdee5af170ad61dcc0" } }, { From b41093b10da4fefaec061feb2ac3a98a4526af43 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Sun, 1 Sep 2024 17:14:41 -0700 Subject: [PATCH 3/5] Update BSK reference. --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 429eb98c78..0cafc69911 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "sam/set-vpn-user-agent", - "revision" : "4d3e43bcd624c0c9f4ac6ffdee5af170ad61dcc0" + "revision" : "07989cdb77b49984167a2e5080a22d02ac438066" } }, { From c66b41951e0772acfecd29e6bfdcda5e5a117902 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Sun, 8 Sep 2024 18:25:23 -0700 Subject: [PATCH 4/5] Update BSK reference. --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1ee678e8eb..81fdd1e52b 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,7 +33,7 @@ "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { "branch" : "sam/set-vpn-user-agent", - "revision" : "07989cdb77b49984167a2e5080a22d02ac438066" + "revision" : "ee3f70eb5116b8eed14403c237b78a2afa05ec63" } }, { From f4654a93604c83ca6295a63aac68955cb34dc5d1 Mon Sep 17 00:00:00 2001 From: Sam Symons Date: Mon, 9 Sep 2024 10:24:00 -0700 Subject: [PATCH 5/5] Update BSK tag. --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 22dccb3a47..db6bfd8eaa 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10713,7 +10713,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 191.2.2; + version = 191.2.3; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f09f01cf70..81fa28071f 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "660971f355c2288ebd3041e92d9674abd9e3a3e0", - "version" : "191.2.2" + "revision" : "b83ccf14b5844e8876de04bcc3074a15569f3b26", + "version" : "191.2.3" } }, {