Prevents VPNSettings from reporting fake changes (#2004)

Task/Issue URL: https://app.asana.com/0/0/1206212872939261/f iOS PR: duckduckgo/iOS#2288 BSK PR: duckduckgo/BrowserServicesKit#614 ## Description Makes some changes to VPNSettings so that it won't publish fake settings updates. Also changes main App's startup behaviour slightly so that the VPN menu app will relaunch every time the main app launches (for debug builds only). This is to make testing easier.
duckduckgo · Dec 22, 2023 · 21845c7 · 21845c7
1 parent e66697b
commit 21845c7
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13044,7 +13044,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 99.0.0;
+				version = 99.0.1;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "2c1c2bb0aad5a23524e298fa9bea9b890ae43e23",
-        "version" : "99.0.0"
+        "revision" : "2dc2db96016b86cbb3a300e102bb68f03e953f4a",
+        "version" : "99.0.1"
       }
     },
     {
@@ -147,7 +147,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
@@ -121,6 +121,11 @@ final class NetworkProtectionAppEvents {
             versionStore.lastVersionRun = currentVersion
         }
 
+#if DEBUG
+        // For debug builds we always want to restart the VPN and VPN menu app to ensure
+        // the latest is loaded
+        restartNetworkProtectionTunnelAndMenu(using: loginItemsManager)
+#else
         // should‘ve been run at least once with NetP enabled
         guard let lastVersionRun = versionStore.lastVersionRun else {
             os_log(.info, log: .networkProtection, "No last version found for the NetP login items, skipping update")
@@ -131,6 +136,7 @@ final class NetworkProtectionAppEvents {
             os_log(.info, log: .networkProtection, "App updated from %{public}s to %{public}s: updating login items", lastVersionRun, currentVersion)
             restartNetworkProtectionTunnelAndMenu(using: loginItemsManager)
         }
+#endif
     }
 
     private func restartNetworkProtectionTunnelAndMenu(using loginItemsManager: LoginItemsManager) {

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper")

diff --git a/LocalPackages/LoginItems/Package.swift b/LocalPackages/LoginItems/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions")
     ],

diff --git a/LocalPackages/PixelKit/Package.swift b/LocalPackages/PixelKit/Package.swift
@@ -20,7 +20,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/Subscription/Package.swift b/LocalPackages/Subscription/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["Subscription"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SwiftUIExtensions/Package.swift b/LocalPackages/SwiftUIExtensions/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         .package(path: "../SwiftUIExtensions"),
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         .target(

diff --git a/LocalPackages/SystemExtensionManager/Package.swift b/LocalPackages/SystemExtensionManager/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

diff --git a/LocalPackages/XPCHelper/Package.swift b/LocalPackages/XPCHelper/Package.swift
@@ -30,7 +30,7 @@ let package = Package(
         .library(name: "XPCHelper", targets: ["XPCHelper"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "99.0.1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.