From 973c5d1bf083798cf8b4e606c5e714f164fceffe Mon Sep 17 00:00:00 2001 From: amddg44 Date: Mon, 22 Jul 2024 11:48:33 +0200 Subject: [PATCH] Undo ship review config hacks --- Core/AppURLs.swift | 3 +-- Core/ios-config.json | 7 ------- DuckDuckGo/AutofillLoginListViewModel.swift | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Core/AppURLs.swift b/Core/AppURLs.swift index da3f7d4e67..7851870c26 100644 --- a/Core/AppURLs.swift +++ b/Core/AppURLs.swift @@ -42,8 +42,7 @@ public extension URL { // The following URLs shall match the ones in update_embedded.sh. // Danger checks that the URLs match on every PR. If the code changes, the regex that Danger uses may need an update. - static let privacyConfig = URL(string: "https://jsonblob.com/api/1262834058273873920")! -// static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v4/ios-config.json")! + static let privacyConfig = URL(string: "\(staticBase)/trackerblocking/config/v4/ios-config.json")! static let trackerDataSet = URL(string: "\(staticBase)/trackerblocking/v5/current/ios-tds.json")! static let bloomFilter = URL(string: "\(staticBase)/https/https-mobile-v2-bloom.bin")! static let bloomFilterSpec = URL(string: "\(staticBase)/https/https-mobile-v2-bloom-spec.json")! diff --git a/Core/ios-config.json b/Core/ios-config.json index 37c3579a7b..6c6cc6fb67 100644 --- a/Core/ios-config.json +++ b/Core/ios-config.json @@ -414,13 +414,6 @@ }, "hash": "bd604dcd1f7bb584185f0c1cb94a5771" }, - "autofillBreakageReporter": { - "state": "enabled", - "settings": { - "monitorIntervalDays": 42 - }, - "exceptions": [] - }, "brokenSiteReportExperiment": { "exceptions": [], "state": "enabled", diff --git a/DuckDuckGo/AutofillLoginListViewModel.swift b/DuckDuckGo/AutofillLoginListViewModel.swift index d0c727adb5..45c9097b10 100644 --- a/DuckDuckGo/AutofillLoginListViewModel.swift +++ b/DuckDuckGo/AutofillLoginListViewModel.swift @@ -521,7 +521,7 @@ final class AutofillLoginListViewModel: ObservableObject { func shouldShowBreakageReporter() -> Bool { guard let currentTabUrl = currentTabUrl, !accountsToSuggest.isEmpty, - privacyConfig.isEnabled(featureKey: .autofill), + privacyConfig.isEnabled(featureKey: .autofillBreakageReporter), let identifier = currentTabUrl.privacySafeDomainIdentifier, !privacyConfig.isInExceptionList(domain: currentTabUrl.host, forFeature: .autofillBreakageReporter) else { return false