From eca7fdd391008e5e4563573a7bacc37c912f4576 Mon Sep 17 00:00:00 2001 From: Michal Smaga Date: Tue, 26 Nov 2024 22:03:55 +0100 Subject: [PATCH] Use WKHTTPCookieStoreWrapper to better control cookie store concurrency (#3625) Task/Issue URL: https://app.asana.com/0/414709148257752/1208829922317861/f **Description**: Use WKHTTPCookieStoreWrapper to better control cookie store concurrency --- ###### Internal references: [Software Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) [Technical Design Template](https://app.asana.com/0/59792373528535/184709971311943) --------- Co-authored-by: Sam Symons --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- DuckDuckGo/AppDelegate.swift | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 42c29bd3dd..11060ea131 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -11040,7 +11040,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = "211.0.0-1"; + version = "211.0.0-2"; }; }; 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 698266001d..b5b0a3243e 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" : "135c63a3058b975cbc2d00ce637f3b9727b717ae", - "version" : "211.0.0-1" + "revision" : "c99d4e9437ae42d89362fc9845171076d3c7cc47", + "version" : "211.0.0-2" } }, { @@ -138,7 +138,7 @@ { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser", + "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b", "version" : "1.4.0" diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift index f23f5a1949..d06791fa82 100644 --- a/DuckDuckGo/AppDelegate.swift +++ b/DuckDuckGo/AppDelegate.swift @@ -428,7 +428,7 @@ import os.log return nil } - return WKWebsiteDataStore.current().httpCookieStore + return WKHTTPCookieStoreWrapper(store: WKWebsiteDataStore.current().httpCookieStore) }, eventMapping: SubscriptionCookieManageEventPixelMapping()) @@ -629,7 +629,7 @@ import os.log } } - Task { @MainActor in + Task { await subscriptionCookieManager.refreshSubscriptionCookie() }