Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update for macOS: visited links #3353

Merged
merged 3 commits into from
Sep 13, 2024
Merged

update for macOS: visited links #3353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d861b
update for macOS: visited links
mallexxx Sep 12, 2024
e38b29e
BSK -> 194.0.0
mallexxx Sep 13, 2024
3e7c58c
Merge remote-tracking branch 'origin/main' into alex/macos-visited-links
mallexxx Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Core/HistoryManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class HistoryManager: HistoryManaging {
let baseDomain = tld.eTLDplus1(domain) else { return }

await withCheckedContinuation { continuation in
historyCoordinator.burnDomains([baseDomain], tld: tld) {
historyCoordinator.burnDomains([baseDomain], tld: tld) { _ in
continuation.resume()
}
}
Expand Down Expand Up @@ -137,8 +137,8 @@ class NullHistoryCoordinator: HistoryCoordinating {
completion()
}

func burnDomains(_ baseDomains: Set<String>, tld: Common.TLD, completion: @escaping () -> Void) {
completion()
func burnDomains(_ baseDomains: Set<String>, tld: Common.TLD, completion: @escaping (Set<URL>) -> Void) {
completion([])
}

func burnVisits(_ visits: [History.Visit], completion: @escaping () -> Void) {
Expand Down
6 changes: 3 additions & 3 deletions Core/SyncErrorHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ public enum AsyncErrorType: String {

public class SyncErrorHandler: EventMapping<SyncError> {
@UserDefaultsWrapper(key: .syncBookmarksPaused, defaultValue: false)
private (set) public var isSyncBookmarksPaused: Bool {
private(set) public var isSyncBookmarksPaused: Bool {
didSet {
isSyncPausedChangedPublisher.send()
}
}

@UserDefaultsWrapper(key: .syncCredentialsPaused, defaultValue: false)
private (set) public var isSyncCredentialsPaused: Bool {
private(set) public var isSyncCredentialsPaused: Bool {
didSet {
isSyncPausedChangedPublisher.send()
}
}

@UserDefaultsWrapper(key: .syncIsPaused, defaultValue: false)
private (set) public var isSyncPaused: Bool {
private(set) public var isSyncPaused: Bool {
didSet {
isSyncPausedChangedPublisher.send()
}
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10853,7 +10853,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 193.2.1;
version = 194.0.0;
};
};
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
6 changes: 3 additions & 3 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "e304d397d61f74a43453748bdc86f933e3fe5425",
"version" : "193.2.1"
"revision" : "026acbd36fb80c95e0bfc6a9080e369dd85db66f",
"version" : "194.0.0"
}
},
{
Expand Down Expand Up @@ -138,7 +138,7 @@
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
"version" : "1.4.0"
Expand Down
Loading