From 16d042f14e05d25b886784a7a806aea34681492f Mon Sep 17 00:00:00 2001 From: amddg44 Date: Mon, 27 Nov 2023 17:16:24 +0100 Subject: [PATCH 1/7] Autofill pixel parameter removed (#2182) Task/Issue URL: https://app.asana.com/0/1205278999335242/1205495150811779/f Tech Design URL: CC: Description: Removes the parameter which distinguishes between the default on or off state of the autofill setting now that new installs are set to enabled by default. --- Core/Pixel.swift | 2 -- .../AutofillLoginPromptViewController.swift | 24 ++++++----------- ...ofillLoginSettingsListViewController.swift | 6 ++--- DuckDuckGo/AutofillSettingStatus.swift | 4 --- ...sswordGenerationPromptViewController.swift | 12 +++------ DuckDuckGo/SaveLoginViewController.swift | 27 +++++++------------ DuckDuckGo/SettingsViewController.swift | 3 +-- DuckDuckGo/TabViewController.swift | 3 +-- ...bViewControllerBrowsingMenuExtension.swift | 3 +-- 9 files changed, 26 insertions(+), 58 deletions(-) diff --git a/Core/Pixel.swift b/Core/Pixel.swift index d358707618..5c24bee78b 100644 --- a/Core/Pixel.swift +++ b/Core/Pixel.swift @@ -126,8 +126,6 @@ public struct PixelParameters { public static let returnUserErrorCode = "error_code" public static let returnUserOldATB = "old_atb" public static let returnUserNewATB = "new_atb" - - public static let autofillDefaultState = "default_state" } public struct PixelValues { diff --git a/DuckDuckGo/AutofillLoginPromptViewController.swift b/DuckDuckGo/AutofillLoginPromptViewController.swift index 5b00fedf7c..1133e169d2 100644 --- a/DuckDuckGo/AutofillLoginPromptViewController.swift +++ b/DuckDuckGo/AutofillLoginPromptViewController.swift @@ -69,11 +69,9 @@ class AutofillLoginPromptViewController: UIViewController { override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) if trigger == AutofillUserScript.GetTriggerType.autoprompt { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptDisplayed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptDisplayed) } else { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDisplayed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDisplayed) } } @@ -97,11 +95,9 @@ class AutofillLoginPromptViewController: UIViewController { extension AutofillLoginPromptViewController: UISheetPresentationControllerDelegate { func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { if self.trigger == AutofillUserScript.GetTriggerType.autoprompt { - Pixel.fire(pixel: .autofillLoginsAutopromptDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsAutopromptDismissed) } else { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed) } completion?(nil, false) } @@ -111,11 +107,9 @@ extension AutofillLoginPromptViewController: AutofillLoginPromptViewModelDelegat func autofillLoginPromptViewModel(_ viewModel: AutofillLoginPromptViewModel, didSelectAccount account: SecureVaultModels.WebsiteAccount) { if trigger == AutofillUserScript.GetTriggerType.autoprompt { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptConfirmed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineAutopromptConfirmed) } else { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualConfirmed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualConfirmed) } if AppDependencyProvider.shared.autofillLoginSession.isValidSession { @@ -169,11 +163,9 @@ extension AutofillLoginPromptViewController: AutofillLoginPromptViewModelDelegat func autofillLoginPromptViewModelDidCancel(_ viewModel: AutofillLoginPromptViewModel) { dismiss(animated: true) { if self.trigger == AutofillUserScript.GetTriggerType.autoprompt { - Pixel.fire(pixel: .autofillLoginsAutopromptDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsAutopromptDismissed) } else { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineManualDismissed) } self.completion?(nil, false) diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift index 89fa680bc1..aa1966ef0f 100644 --- a/DuckDuckGo/AutofillLoginSettingsListViewController.swift +++ b/DuckDuckGo/AutofillLoginSettingsListViewController.swift @@ -693,11 +693,9 @@ extension AutofillLoginSettingsListViewController: AutofillLoginDetailsViewContr extension AutofillLoginSettingsListViewController: EnableAutofillSettingsTableViewCellDelegate { func enableAutofillSettingsTableViewCell(_ cell: EnableAutofillSettingsTableViewCell, didChangeSettings value: Bool) { if value { - Pixel.fire(pixel: .autofillLoginsSettingsEnabled, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSettingsEnabled) } else { - Pixel.fire(pixel: .autofillLoginsSettingsDisabled, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSettingsDisabled) } viewModel.isAutofillEnabledInSettings = value diff --git a/DuckDuckGo/AutofillSettingStatus.swift b/DuckDuckGo/AutofillSettingStatus.swift index ccbabfd07c..4e7ed3f789 100644 --- a/DuckDuckGo/AutofillSettingStatus.swift +++ b/DuckDuckGo/AutofillSettingStatus.swift @@ -30,8 +30,4 @@ struct AutofillSettingStatus { let canAuthenticate = context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &error) return appSettings.autofillCredentialsEnabled && canAuthenticate } - - static var defaultState: String { - return appSettings.autofillCredentialsHasBeenEnabledAutomaticallyIfNecessary ? "on" : "off" - } } diff --git a/DuckDuckGo/PasswordGenerationPromptViewController.swift b/DuckDuckGo/PasswordGenerationPromptViewController.swift index e0e015466b..4ac1c56edb 100644 --- a/DuckDuckGo/PasswordGenerationPromptViewController.swift +++ b/DuckDuckGo/PasswordGenerationPromptViewController.swift @@ -49,8 +49,7 @@ class PasswordGenerationPromptViewController: UIViewController { setupPasswordGenerationPromptView() - Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDisplayed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDisplayed) } private func setupPasswordGenerationPromptView() { @@ -68,8 +67,7 @@ class PasswordGenerationPromptViewController: UIViewController { extension PasswordGenerationPromptViewController: UISheetPresentationControllerDelegate { func presentationControllerDidDismiss(_ presentationController: UIPresentationController) { - Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed) self.completion?(false) } @@ -77,8 +75,7 @@ extension PasswordGenerationPromptViewController: UISheetPresentationControllerD extension PasswordGenerationPromptViewController: PasswordGenerationPromptViewModelDelegate { func passwordGenerationPromptViewModelDidSelect(_ viewModel: PasswordGenerationPromptViewModel) { - Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptConfirmed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptConfirmed) dismiss(animated: true) { self.completion?(true) @@ -86,8 +83,7 @@ extension PasswordGenerationPromptViewController: PasswordGenerationPromptViewMo } func passwordGenerationPromptViewModelDidCancel(_ viewModel: PasswordGenerationPromptViewModel) { - Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsPasswordGenerationPromptDismissed) dismiss(animated: true) { self.completion?(false) diff --git a/DuckDuckGo/SaveLoginViewController.swift b/DuckDuckGo/SaveLoginViewController.swift index 056546bed6..e23d42d1f5 100644 --- a/DuckDuckGo/SaveLoginViewController.swift +++ b/DuckDuckGo/SaveLoginViewController.swift @@ -72,11 +72,9 @@ class SaveLoginViewController: UIViewController { } switch viewModel.layoutType { case .newUser, .saveLogin: - Pixel.fire(pixel: .autofillLoginsSaveLoginModalDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSaveLoginModalDismissed) case .savePassword: - Pixel.fire(pixel: .autofillLoginsSavePasswordModalDismissed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSavePasswordModalDismissed) case .updateUsername: Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDismissed) case .updatePassword: @@ -98,11 +96,9 @@ class SaveLoginViewController: UIViewController { switch saveViewModel.layoutType { case .newUser, .saveLogin: - Pixel.fire(pixel: .autofillLoginsSaveLoginModalDisplayed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSaveLoginModalDisplayed) case .savePassword: - Pixel.fire(pixel: .autofillLoginsSavePasswordModalDisplayed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSavePasswordModalDisplayed) case .updateUsername: Pixel.fire(pixel: .autofillLoginsUpdateUsernameModalDisplayed) case .updatePassword: @@ -116,11 +112,9 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate { switch viewModel.layoutType { case .saveLogin, .savePassword, .newUser: if viewModel.layoutType == .savePassword { - Pixel.fire(pixel: .autofillLoginsSavePasswordModalConfirmed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSavePasswordModalConfirmed) } else { - Pixel.fire(pixel: .autofillLoginsSaveLoginModalConfirmed, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsSaveLoginModalConfirmed) } delegate?.saveLoginViewController(self, didSaveCredentials: credentialManager.credentials) case .updatePassword, .updateUsername: @@ -152,8 +146,7 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate { alertController.overrideUserInterfaceStyle() let disableAction = UIAlertAction(title: UserText.autofillKeepEnabledAlertDisableAction, style: .cancel) { _ in - Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillDisabled, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillDisabled) if isSelfPresentingAlert { self.delegate?.saveLoginViewControllerDidCancel(self) } @@ -161,8 +154,7 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate { } let keepUsingAction = UIAlertAction(title: UserText.autofillKeepEnabledAlertKeepUsingAction, style: .default) { _ in - Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillKept, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptAutofillKept) if isSelfPresentingAlert { self.delegate?.saveLoginViewControllerDidCancel(self) } @@ -176,8 +168,7 @@ extension SaveLoginViewController: SaveLoginViewModelDelegate { if isAlreadyDismissed { delegate?.saveLoginViewController(self, didRequestPresentConfirmKeepUsingAlertController: alertController) } else { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown) present(alertController, animated: true) } } diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift index 3a8a70a8a6..0f52a73f5a 100644 --- a/DuckDuckGo/SettingsViewController.swift +++ b/DuckDuckGo/SettingsViewController.swift @@ -399,8 +399,7 @@ class SettingsViewController: UITableViewController { syncDataProviders: syncDataProviders ) autofillController.delegate = self - Pixel.fire(pixel: .autofillSettingsOpened, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillSettingsOpened) navigationController?.pushViewController(autofillController, animated: animated) } diff --git a/DuckDuckGo/TabViewController.swift b/DuckDuckGo/TabViewController.swift index e54ad09196..22e662952d 100644 --- a/DuckDuckGo/TabViewController.swift +++ b/DuckDuckGo/TabViewController.swift @@ -2569,8 +2569,7 @@ extension TabViewController: SaveLoginViewControllerDelegate { func saveLoginViewController(_ viewController: SaveLoginViewController, didRequestPresentConfirmKeepUsingAlertController alertController: UIAlertController) { - Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .autofillLoginsFillLoginInlineDisablePromptShown) present(alertController, animated: true) } } diff --git a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift index 8c9e3a274b..835f9eb89d 100644 --- a/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift +++ b/DuckDuckGo/TabViewControllerBrowsingMenuExtension.swift @@ -369,8 +369,7 @@ extension TabViewController { } private func onOpenAutofillLoginsAction() { - Pixel.fire(pixel: .browsingMenuAutofill, - withAdditionalParameters: [PixelParameters.autofillDefaultState: AutofillSettingStatus.defaultState]) + Pixel.fire(pixel: .browsingMenuAutofill) delegate?.tabDidRequestAutofillLogins(tab: self) } From 8263fbe91fbd6781d6a1285871c78d4f32b3f787 Mon Sep 17 00:00:00 2001 From: Dominik Kapusta Date: Mon, 27 Nov 2023 17:45:38 +0100 Subject: [PATCH 2/7] Fix migrating from Bookmarks V2 and older (#2196) Co-authored-by: Chris Brind --- 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 386610fafa..b1832a4068 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9199,7 +9199,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 85.1.0; + version = 85.1.1; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b369637cf4..1eb97f222f 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "820203512819e81c4dd5ff0b53711d0010a8253c", - "version": "85.1.0" + "revision": "543e1d7ed9b5743d4e6b0ebe18a5fbf8f1441f02", + "version": "85.1.1" } }, { From ac1cd2cd66f47be5517e2ba2e5b5f4ddb4758cf9 Mon Sep 17 00:00:00 2001 From: Diego Rey Mendez Date: Tue, 28 Nov 2023 03:18:24 +0100 Subject: [PATCH 3/7] Update BSK for VPN settings (#2165) Task/Issue URL: https://app.asana.com/0/0/1205958731729756/f BSK PR: duckduckgo/BrowserServicesKit#565 macOS PR: duckduckgo/macos-browser#1858 Description Updates BSK with the latest changes. --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- ...orkProtectionConvenienceInitialisers.swift | 17 ++++++------- ...etworkProtectionVPNLocationViewModel.swift | 14 +++++------ ...kProtectionVPNNotificationsViewModel.swift | 10 ++++---- ...etworkProtectionVPNSettingsViewModel.swift | 8 +++---- ...kProtectionVPNLocationViewModelTests.swift | 24 +++++++++---------- ...etworkProtectionPacketTunnelProvider.swift | 6 ++--- 8 files changed, 41 insertions(+), 44 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index b1832a4068..bd0be4db88 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9199,7 +9199,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 85.1.1; + version = 86.0.0; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1eb97f222f..548739b3ef 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "543e1d7ed9b5743d4e6b0ebe18a5fbf8f1441f02", - "version": "85.1.1" + "revision": "1331652ad0dc21c23b495b4a9a42e2a0eb44859d", + "version": "86.0.0" } }, { diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift index 2557f2f1d3..193e9c959b 100644 --- a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift +++ b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift @@ -54,9 +54,9 @@ extension NetworkProtectionKeychainTokenStore { extension NetworkProtectionCodeRedemptionCoordinator { convenience init() { - let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults) + let settings = VPNSettings(defaults: .networkProtectionGroupDefaults) self.init( - environment: tunnelSettings.selectedEnvironment, + environment: settings.selectedEnvironment, tokenStore: NetworkProtectionKeychainTokenStore(), errorEvents: .networkProtectionAppDebugEvents ) @@ -65,27 +65,24 @@ extension NetworkProtectionCodeRedemptionCoordinator { extension NetworkProtectionVPNNotificationsViewModel { convenience init() { - let notificationsSettingsStore = NetworkProtectionNotificationsSettingsUserDefaultsStore(userDefaults: .networkProtectionGroupDefaults) self.init( notificationsAuthorization: NotificationsAuthorizationController(), - notificationsSettingsStore: notificationsSettingsStore + settings: VPNSettings(defaults: .networkProtectionGroupDefaults) ) } } extension NetworkProtectionVPNSettingsViewModel { convenience init() { - self.init( - tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults) - ) + self.init(settings: VPNSettings(defaults: .networkProtectionGroupDefaults)) } } extension NetworkProtectionLocationListCompositeRepository { convenience init() { - let tunnelSettings = TunnelSettings(defaults: .networkProtectionGroupDefaults) + let settings = VPNSettings(defaults: .networkProtectionGroupDefaults) self.init( - environment: tunnelSettings.selectedEnvironment, + environment: settings.selectedEnvironment, tokenStore: NetworkProtectionKeychainTokenStore() ) } @@ -96,7 +93,7 @@ extension NetworkProtectionVPNLocationViewModel { let locationListRepository = NetworkProtectionLocationListCompositeRepository() self.init( locationListRepository: locationListRepository, - tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults) + settings: VPNSettings(defaults: .networkProtectionGroupDefaults) ) } } diff --git a/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift b/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift index c67feabce2..38dfdd1b66 100644 --- a/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift +++ b/DuckDuckGo/NetworkProtectionVPNLocationViewModel.swift @@ -25,7 +25,7 @@ import NetworkProtection final class NetworkProtectionVPNLocationViewModel: ObservableObject { private let locationListRepository: NetworkProtectionLocationListRepository - private let tunnelSettings: TunnelSettings + private let settings: VPNSettings @Published public var state: LoadingState @Published public var isNearestSelected: Bool @@ -43,11 +43,11 @@ final class NetworkProtectionVPNLocationViewModel: ObservableObject { } } - init(locationListRepository: NetworkProtectionLocationListRepository, tunnelSettings: TunnelSettings) { + init(locationListRepository: NetworkProtectionLocationListRepository, settings: VPNSettings) { self.locationListRepository = locationListRepository - self.tunnelSettings = tunnelSettings + self.settings = settings state = .loading - self.isNearestSelected = tunnelSettings.selectedLocation == .nearest + self.isNearestSelected = settings.selectedLocation == .nearest } func onViewAppeared() async { @@ -55,20 +55,20 @@ final class NetworkProtectionVPNLocationViewModel: ObservableObject { } func onNearestItemSelection() async { - tunnelSettings.selectedLocation = .nearest + settings.selectedLocation = .nearest await reloadList() } func onCountryItemSelection(id: String, cityId: String? = nil) async { let location = NetworkProtectionSelectedLocation(country: id, city: cityId) - tunnelSettings.selectedLocation = .location(location) + settings.selectedLocation = .location(location) await reloadList() } @MainActor private func reloadList() async { guard let list = try? await locationListRepository.fetchLocationList() else { return } - let selectedLocation = self.tunnelSettings.selectedLocation + let selectedLocation = self.settings.selectedLocation let isNearestSelected = selectedLocation == .nearest let countryItems = list.map { currentLocation in diff --git a/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift b/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift index 62833eb25a..096f2194c9 100644 --- a/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift +++ b/DuckDuckGo/NetworkProtectionVPNNotificationsViewModel.swift @@ -31,16 +31,16 @@ enum NetworkProtectionNotificationsViewKind: Equatable { final class NetworkProtectionVPNNotificationsViewModel: ObservableObject { private var notificationsAuthorization: NotificationsAuthorizationControlling - private var notificationsSettingsStore: NetworkProtectionNotificationsSettingsStore + private var settings: VPNSettings @Published var viewKind: NetworkProtectionNotificationsViewKind = .loading var alertsEnabled: Bool { - self.notificationsSettingsStore.alertsEnabled + self.settings.notifyStatusChanges } init(notificationsAuthorization: NotificationsAuthorizationControlling, - notificationsSettingsStore: NetworkProtectionNotificationsSettingsStore) { + settings: VPNSettings) { self.notificationsAuthorization = notificationsAuthorization - self.notificationsSettingsStore = notificationsSettingsStore + self.settings = settings self.notificationsAuthorization.delegate = self } @@ -55,7 +55,7 @@ final class NetworkProtectionVPNNotificationsViewModel: ObservableObject { } func didToggleAlerts(to enabled: Bool) { - notificationsSettingsStore.alertsEnabled = enabled + settings.notifyStatusChanges = enabled } private func updateViewKind(for authorizationStatus: UNAuthorizationStatus) { diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift b/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift index 19664143e8..14820ce112 100644 --- a/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift +++ b/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift @@ -24,14 +24,14 @@ import NetworkProtection import Combine final class NetworkProtectionVPNSettingsViewModel: ObservableObject { - private let tunnelSettings: TunnelSettings + private let settings: VPNSettings private var cancellable: AnyCancellable? @Published public var preferredLocation: String = UserText.netPPreferredLocationNearest - init(tunnelSettings: TunnelSettings) { - self.tunnelSettings = tunnelSettings - cancellable = tunnelSettings.selectedLocationPublisher.map { selectedLocation in + init(settings: VPNSettings) { + self.settings = settings + cancellable = settings.selectedLocationPublisher.map { selectedLocation in guard let selectedLocation = selectedLocation.location else { return UserText.netPPreferredLocationNearest } diff --git a/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift b/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift index 8bfdafd4db..73e6bf09be 100644 --- a/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift +++ b/DuckDuckGoTests/NetworkProtectionVPNLocationViewModelTests.swift @@ -28,7 +28,7 @@ import NetworkProtectionTestUtils final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { private var listRepository: MockNetworkProtectionLocationListRepository! - private var tunnelSettings: TunnelSettings! + private var settings: VPNSettings! private var viewModel: NetworkProtectionVPNLocationViewModel! @MainActor @@ -36,13 +36,13 @@ final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { super.setUp() listRepository = MockNetworkProtectionLocationListRepository() let testDefaults = UserDefaults(suiteName: #file + Thread.current.debugDescription)! - tunnelSettings = TunnelSettings(defaults: testDefaults) - viewModel = NetworkProtectionVPNLocationViewModel(locationListRepository: listRepository, tunnelSettings: tunnelSettings) + settings = VPNSettings(defaults: testDefaults) + viewModel = NetworkProtectionVPNLocationViewModel(locationListRepository: listRepository, settings: settings) } override func tearDown() { - tunnelSettings.selectedLocation = .nearest - tunnelSettings = nil + settings.selectedLocation = .nearest + settings = nil listRepository = nil viewModel = nil super.tearDown() @@ -70,28 +70,28 @@ final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { func test_onViewAppeared_selectedCountryFromSettings_isSelectedSetToTrue() async throws { try await assertOnListLoad_countryIsSelected { [weak self] testCaseCountryId in - self?.tunnelSettings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: testCaseCountryId)) + self?.settings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: testCaseCountryId)) await self?.viewModel.onViewAppeared() } } func test_onViewAppeared_NOTSelectedCountryFromSettings_isSelectedSetToFalse() async throws { try await assertOnListLoad_isSelectedSetToFalse { [weak self] in - self?.tunnelSettings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: "US")) + self?.settings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: "US")) await self?.viewModel.onViewAppeared() } } func test_onViewAppeared_nearestSelectedInSettings_isNearestSelectedSetToTrue() async throws { try await assertNearestSelectedSetToTrue { [weak self] in - self?.tunnelSettings.selectedLocation = .nearest + self?.settings.selectedLocation = .nearest await self?.viewModel.onViewAppeared() } } func test_onViewAppeared_nearestNOTSelectedInSettings_isNearestSelectedSetToFalse() async throws { try await assertNearestSelectedSetToFalse { [weak self] testCaseCountryId in - self?.tunnelSettings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: testCaseCountryId)) + self?.settings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: testCaseCountryId)) await self?.viewModel.onViewAppeared() } } @@ -128,7 +128,7 @@ final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { func test_onViewAppeared_cityIsSelected_itemIsSelected() async throws { try await assertOnListLoad_itemIsSelected { [weak self] testCase in - self?.tunnelSettings.selectedLocation = .location(testCase) + self?.settings.selectedLocation = .location(testCase) await self?.viewModel.onViewAppeared() } } @@ -140,7 +140,7 @@ final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { ] listRepository.stubLocationList = countries - tunnelSettings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: "US", city: "New York")) + settings.selectedLocation = .location(NetworkProtectionSelectedLocation(country: "US", city: "New York")) await viewModel.onViewAppeared() let selectedItems = try loadedItems().flatMap { $0.cityPickerItems }.filter(\.isSelected) XCTAssertEqual(selectedItems.count, 0) @@ -148,7 +148,7 @@ final class NetworkProtectionVPNLocationViewModelTests: XCTestCase { func test_onViewAppeared_countryWithoutCityIsSelected_nearestItemIsSelected() async throws { try await assertOnListLoad_nearestItemIsSelected { [weak self] testCase in - self?.tunnelSettings.selectedLocation = .location(testCase) + self?.settings.selectedLocation = .location(testCase) await self?.viewModel.onViewAppeared() } } diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift index 4943d79eb3..0f1fe33c1b 100644 --- a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift +++ b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift @@ -176,9 +176,9 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider { errorEvents: nil) let errorStore = NetworkProtectionTunnelErrorStore() let notificationsPresenter = NetworkProtectionUNNotificationPresenter() - let notificationsSettingsStore = NetworkProtectionNotificationsSettingsUserDefaultsStore(userDefaults: .networkProtectionGroupDefaults) + let settings = VPNSettings(defaults: .networkProtectionGroupDefaults) let nofificationsPresenterDecorator = NetworkProtectionNotificationsPresenterTogglableDecorator( - notificationSettingsStore: notificationsSettingsStore, + settings: settings, wrappee: notificationsPresenter ) notificationsPresenter.requestAuthorization() @@ -189,7 +189,7 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider { tokenStore: tokenStore, debugEvents: Self.networkProtectionDebugEvents(controllerErrorStore: errorStore), providerEvents: Self.packetTunnelProviderEvents, - tunnelSettings: TunnelSettings(defaults: .networkProtectionGroupDefaults)) + settings: settings) startMonitoringMemoryPressureEvents() observeServerChanges() APIRequest.Headers.setUserAgent(DefaultUserAgentManager.duckDuckGoUserAgent) From 0d3c75584c4193ac228615897fedecb9906ee03c Mon Sep 17 00:00:00 2001 From: Graeme Arthur Date: Tue, 28 Nov 2023 17:38:27 +0100 Subject: [PATCH 4/7] Remove disabled switches from VPN Settings screen (#2203) --- .../NetworkProtectionVPNLocationView.swift | 3 +- .../NetworkProtectionVPNSettingsView.swift | 61 ++++++------------- DuckDuckGo/UserText.swift | 3 - DuckDuckGo/en.lproj/Localizable.strings | 9 --- 4 files changed, 22 insertions(+), 54 deletions(-) diff --git a/DuckDuckGo/NetworkProtectionVPNLocationView.swift b/DuckDuckGo/NetworkProtectionVPNLocationView.swift index dc673400e3..31425e33d7 100644 --- a/DuckDuckGo/NetworkProtectionVPNLocationView.swift +++ b/DuckDuckGo/NetworkProtectionVPNLocationView.swift @@ -134,7 +134,7 @@ private struct CountryItem: View { } label: { Image(systemName: "ellipsis.circle") .resizable() - .frame(width: 22, height: 22) + .frame(width: 22, height: 22).tint(.textSecondary) } } } @@ -184,6 +184,7 @@ private struct MenuItem: View { .if(!isSelected) { $0.hidden() } + .tint(.textPrimary) } } ) diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift index f22075f044..f0270da42a 100644 --- a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift +++ b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift @@ -27,53 +27,31 @@ struct NetworkProtectionVPNSettingsView: View { @StateObject var viewModel = NetworkProtectionVPNSettingsViewModel() var body: some View { - List { - NavigationLink(destination: NetworkProtectionVPNLocationView()) { - HStack { - Text(UserText.netPPreferredLocationSettingTitle).daxBodyRegular().foregroundColor(.textPrimary) - Spacer() - Text(viewModel.preferredLocation).daxBodyRegular().foregroundColor(.textSecondary) + VStack { + List { + Section { + NavigationLink(destination: NetworkProtectionVPNLocationView()) { + HStack { + Text(UserText.netPPreferredLocationSettingTitle).daxBodyRegular().foregroundColor(.textPrimary) + Spacer() + Text(viewModel.preferredLocation).daxBodyRegular().foregroundColor(.textSecondary) + } + } + } + Section { + HStack(spacing: 16) { + Image("Info-Solid-24") + .foregroundColor(.icon) + Text(UserText.netPSecureDNSSettingFooter) + .daxFootnoteRegular() + .foregroundColor(.textSecondary) + } } } - toggleSection( - text: UserText.netPAlwaysOnSettingTitle, - footerText: UserText.netPAlwaysOnSettingFooter - ) - toggleSection( - text: UserText.netPSecureDNSSettingTitle, - footerText: UserText.netPSecureDNSSettingFooter - ) } .applyInsetGroupedListStyle() .navigationTitle(UserText.netPVPNSettingsTitle) } - - @ViewBuilder - func toggleSection(text: String, footerText: String) -> some View { - Section { - HStack { - VStack(alignment: .leading, spacing: 4) { - Text(text) - .font(.system(size: 16)) - .foregroundColor(.textPrimary.opacity(0.4)) - .font(.system(size: 13)) - .foregroundColor(.textSecondary.opacity(0.4)) - } - - // These toggles are permanantly disabled as the features are permanantly enabled. Product decision. - Toggle("", isOn: .constant(true)) - .disabled(true) - .toggleStyle(SwitchToggleStyle(tint: .controlColor)) - } - .listRowBackground(Color.cellBackground) - } footer: { - Text(footerText) - .foregroundColor(.textSecondary) - .accentColor(Color.controlColor) - .font(.system(size: 13)) - .padding(.top, 6) - } - } } private extension Color { @@ -81,6 +59,7 @@ private extension Color { static let textSecondary = Color(designSystemColor: .textSecondary) static let cellBackground = Color(designSystemColor: .surface) static let controlColor = Color(designSystemColor: .accent) + static let icon = Color(designSystemColor: .icons).opacity(0.3) } #endif diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift index 6b15c281f1..80b88c0891 100644 --- a/DuckDuckGo/UserText.swift +++ b/DuckDuckGo/UserText.swift @@ -660,9 +660,6 @@ In addition to the details entered into this form, your app issue report will co let message = NSLocalizedString("network.protection.vpn.location.country.item.formatted.cities.count", value: "%d cities", comment: "Subtitle of countries item when there are multiple cities, example : ") return message.format(arguments: count) } - static let netPAlwaysOnSettingTitle = NSLocalizedString("network.protection.vpn.always.on.setting.title", value: "Always On", comment: "Title for the Always on VPN setting item.") - static let netPAlwaysOnSettingFooter = NSLocalizedString("network.protection.vpn.always.on.setting.footer", value: "Automatically restore a VPN connection after interruption.", comment: "Footer text for the Always on VPN setting item.") - static let netPSecureDNSSettingTitle = NSLocalizedString("network.protection.vpn.secure.dns.setting.title", value: "Secure DNS", comment: "Title for the Always on VPN setting item.") static let netPSecureDNSSettingFooter = NSLocalizedString("network.protection.vpn.secure.dns.setting.footer", value: "Network Protection prevents DNS leaks to your Internet Service Provider by routing DNS queries though the VPN tunnel to our own resolver.", comment: "Footer text for the Always on VPN setting item.") static let netPTurnOnNotificationsButtonTitle = NSLocalizedString("network.protection.turn.on.notifications.button.title", value: "Turn on Notifications", comment: "Title for the button to link to the iOS app settings and enable notifications app-wide.") static let netPTurnOnNotificationsSectionFooter = NSLocalizedString("network.protection.turn.on.notifications.section.footer", value: "Allow DuckDuckGo to notify you if your connection drops or VPN status changes.", comment: "Footer text under the button to link to the iOS app settings and enable notifications app-wide.") diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings index f10a4c5602..6414e52e6b 100644 --- a/DuckDuckGo/en.lproj/Localizable.strings +++ b/DuckDuckGo/en.lproj/Localizable.strings @@ -1609,12 +1609,6 @@ https://duckduckgo.com/mac"; /* Title for the toggle for VPN alerts. */ "network.protection.vpn.alerts.toggle.title" = "VPN Alerts"; -/* Footer text for the Always on VPN setting item. */ -"network.protection.vpn.always.on.setting.footer" = "Automatically restore a VPN connection after interruption."; - -/* Title for the Always on VPN setting item. */ -"network.protection.vpn.always.on.setting.title" = "Always On"; - /* Title for the VPN Location screen's All Countries section. */ "network.protection.vpn.location.all.countries.section.title" = "All Countries"; @@ -1645,9 +1639,6 @@ https://duckduckgo.com/mac"; /* Footer text for the Always on VPN setting item. */ "network.protection.vpn.secure.dns.setting.footer" = "Network Protection prevents DNS leaks to your Internet Service Provider by routing DNS queries though the VPN tunnel to our own resolver."; -/* Title for the Always on VPN setting item. */ -"network.protection.vpn.secure.dns.setting.title" = "Secure DNS"; - /* Title for the VPN Settings screen. */ "network.protection.vpn.settings.title" = "VPN Settings"; From 5ddde8137a79efabeb6fb800794b24b8e1a9f853 Mon Sep 17 00:00:00 2001 From: Anh Do <18567+quanganhdo@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:11:52 -0500 Subject: [PATCH 5/7] Update iOS privacy defaults (#2185) Co-authored-by: Diego Rey Mendez --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 +-- .../NetworkProtectionVPNSettingsView.swift | 33 +++++++++++++++++++ ...etworkProtectionVPNSettingsViewModel.swift | 30 ++++++++++++----- DuckDuckGo/UserText.swift | 2 ++ DuckDuckGo/en.lproj/Localizable.strings | 6 ++++ 6 files changed, 65 insertions(+), 12 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index bd0be4db88..6dd202dfe1 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -9199,7 +9199,7 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 86.0.0; + version = 86.1.0; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 548739b3ef..74efce3cce 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/DuckDuckGo/BrowserServicesKit", "state": { "branch": null, - "revision": "1331652ad0dc21c23b495b4a9a42e2a0eb44859d", - "version": "86.0.0" + "revision": "1400c9ca17dd770d6eb708288f97c9aab749d0ef", + "version": "86.1.0" } }, { diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift index f0270da42a..f7b5c33774 100644 --- a/DuckDuckGo/NetworkProtectionVPNSettingsView.swift +++ b/DuckDuckGo/NetworkProtectionVPNSettingsView.swift @@ -38,6 +38,15 @@ struct NetworkProtectionVPNSettingsView: View { } } } + toggleSection( + text: UserText.netPExcludeLocalNetworksSettingTitle, + footerText: UserText.netPExcludeLocalNetworksSettingFooter + ) { + Toggle("", isOn: $viewModel.excludeLocalNetworks) + .onTapGesture { + viewModel.toggleExcludeLocalNetworks() + } + } Section { HStack(spacing: 16) { Image("Info-Solid-24") @@ -52,6 +61,30 @@ struct NetworkProtectionVPNSettingsView: View { .applyInsetGroupedListStyle() .navigationTitle(UserText.netPVPNSettingsTitle) } + + @ViewBuilder + func toggleSection(text: String, footerText: String, @ViewBuilder toggle: () -> some View) -> some View { + Section { + HStack { + VStack(alignment: .leading, spacing: 4) { + Text(text) + .daxBodyRegular() + .foregroundColor(.textPrimary) + .layoutPriority(1) + } + + toggle() + .toggleStyle(SwitchToggleStyle(tint: .controlColor)) + } + .listRowBackground(Color.cellBackground) + } footer: { + Text(footerText) + .foregroundColor(.textSecondary) + .accentColor(Color.controlColor) + .daxFootnoteRegular() + .padding(.top, 6) + } + } } private extension Color { diff --git a/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift b/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift index 14820ce112..f7ff89c53f 100644 --- a/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift +++ b/DuckDuckGo/NetworkProtectionVPNSettingsViewModel.swift @@ -25,21 +25,33 @@ import Combine final class NetworkProtectionVPNSettingsViewModel: ObservableObject { private let settings: VPNSettings - private var cancellable: AnyCancellable? + private var cancellables: Set = [] @Published public var preferredLocation: String = UserText.netPPreferredLocationNearest + @Published public var excludeLocalNetworks: Bool = true init(settings: VPNSettings) { self.settings = settings - cancellable = settings.selectedLocationPublisher.map { selectedLocation in - guard let selectedLocation = selectedLocation.location else { - return UserText.netPPreferredLocationNearest + settings.selectedLocationPublisher + .map { selectedLocation in + guard let selectedLocation = selectedLocation.location else { + return UserText.netPPreferredLocationNearest + } + guard let city = selectedLocation.city else { + return Self.localizedString(forRegionCode: selectedLocation.country) + } + return "\(city), \(Self.localizedString(forRegionCode: selectedLocation.country))" } - guard let city = selectedLocation.city else { - return Self.localizedString(forRegionCode: selectedLocation.country) - } - return "\(city), \(Self.localizedString(forRegionCode: selectedLocation.country))" - }.assign(to: \.preferredLocation, onWeaklyHeld: self) + .assign(to: \.preferredLocation, onWeaklyHeld: self) + .store(in: &cancellables) + + settings.excludeLocalNetworksPublisher + .assign(to: \.excludeLocalNetworks, onWeaklyHeld: self) + .store(in: &cancellables) + } + + func toggleExcludeLocalNetworks() { + settings.excludeLocalNetworks.toggle() } private static func localizedString(forRegionCode: String) -> String { diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift index 80b88c0891..0a67d5dcc8 100644 --- a/DuckDuckGo/UserText.swift +++ b/DuckDuckGo/UserText.swift @@ -660,6 +660,8 @@ In addition to the details entered into this form, your app issue report will co let message = NSLocalizedString("network.protection.vpn.location.country.item.formatted.cities.count", value: "%d cities", comment: "Subtitle of countries item when there are multiple cities, example : ") return message.format(arguments: count) } + static let netPExcludeLocalNetworksSettingTitle = NSLocalizedString("network.protection.vpn.exclude.local.networks.setting.title", value: "Exclude Local Networks", comment: "Title for the Exclude Local Networks setting item.") + static let netPExcludeLocalNetworksSettingFooter = NSLocalizedString("network.protection.vpn.exclude.local.networks.setting.footer", value: "Bypass the VPN for local network connections, like to a printer.", comment: "Footer text for the Exclude Local Networks setting item.") static let netPSecureDNSSettingFooter = NSLocalizedString("network.protection.vpn.secure.dns.setting.footer", value: "Network Protection prevents DNS leaks to your Internet Service Provider by routing DNS queries though the VPN tunnel to our own resolver.", comment: "Footer text for the Always on VPN setting item.") static let netPTurnOnNotificationsButtonTitle = NSLocalizedString("network.protection.turn.on.notifications.button.title", value: "Turn on Notifications", comment: "Title for the button to link to the iOS app settings and enable notifications app-wide.") static let netPTurnOnNotificationsSectionFooter = NSLocalizedString("network.protection.turn.on.notifications.section.footer", value: "Allow DuckDuckGo to notify you if your connection drops or VPN status changes.", comment: "Footer text under the button to link to the iOS app settings and enable notifications app-wide.") diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings index 6414e52e6b..aa23444dbd 100644 --- a/DuckDuckGo/en.lproj/Localizable.strings +++ b/DuckDuckGo/en.lproj/Localizable.strings @@ -1609,6 +1609,12 @@ https://duckduckgo.com/mac"; /* Title for the toggle for VPN alerts. */ "network.protection.vpn.alerts.toggle.title" = "VPN Alerts"; +/* Footer text for the Exclude Local Networks setting item. */ +"network.protection.vpn.exclude.local.networks.setting.footer" = "Bypass the VPN for local network connections, like to a printer."; + +/* Title for the Exclude Local Networks setting item. */ +"network.protection.vpn.exclude.local.networks.setting.title" = "Exclude Local Networks"; + /* Title for the VPN Location screen's All Countries section. */ "network.protection.vpn.location.all.countries.section.title" = "All Countries"; From bca38bc3dc59ea56d3263b7b61312fd23cae0661 Mon Sep 17 00:00:00 2001 From: bwaresiak Date: Wed, 29 Nov 2023 12:40:42 +0100 Subject: [PATCH 6/7] Release 7.99.0 (#2205) --- Configuration/Version.xcconfig | 2 +- .../AppPrivacyConfigurationDataProvider.swift | 4 +- Core/AppTrackerDataSetProvider.swift | 4 +- Core/ios-config.json | 163 +- Core/trackerData.json | 1551 ++++++++++------- DuckDuckGo.xcodeproj/project.pbxproj | 42 +- DuckDuckGo/Settings.bundle/Root.plist | 2 +- 7 files changed, 1078 insertions(+), 690 deletions(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index 698f293328..3e6917b72b 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 7.97.1 +MARKETING_VERSION = 7.99.0 diff --git a/Core/AppPrivacyConfigurationDataProvider.swift b/Core/AppPrivacyConfigurationDataProvider.swift index c984d0206f..81a313c2df 100644 --- a/Core/AppPrivacyConfigurationDataProvider.swift +++ b/Core/AppPrivacyConfigurationDataProvider.swift @@ -23,8 +23,8 @@ import BrowserServicesKit final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"b8a321aec612923a53b958fbdbfa541e\"" - public static let embeddedDataSHA = "af271d73da0863e678670fb0d9cf4f8269ddb7e584599bfb57d5a370961dbc4b" + public static let embeddedDataETag = "\"7c6169d648700908e0dfc5904d640c37\"" + public static let embeddedDataSHA = "e3cd448b68a22fe6c9563deeb4c7d2a62ae947bc655ff33b3fc030bba766672c" } public var embeddedDataEtag: String { diff --git a/Core/AppTrackerDataSetProvider.swift b/Core/AppTrackerDataSetProvider.swift index c41f8ed1b5..6cdd458869 100644 --- a/Core/AppTrackerDataSetProvider.swift +++ b/Core/AppTrackerDataSetProvider.swift @@ -23,8 +23,8 @@ import BrowserServicesKit final public class AppTrackerDataSetProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"3a50d09fd78a893f1a284051d1f777de\"" - public static let embeddedDataSHA = "2c1995807a61fd9fa311baab01633411282759732f098765f5380bda5e92b9e2" + public static let embeddedDataETag = "\"b879198dd7dcd9e5f1e5ce0a5d4ba782\"" + public static let embeddedDataSHA = "0006b1b27b94f5006ba2576f96dd8c7ab0e66943b5556458ea99002aeb80ac1a" } public var embeddedDataEtag: String { diff --git a/Core/ios-config.json b/Core/ios-config.json index 3283af4e90..092015bfeb 100644 --- a/Core/ios-config.json +++ b/Core/ios-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1700585688784, + "version": 1701253939396, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -1251,6 +1251,9 @@ { "domain": "formula1.com" }, + { + "domain": "gigisplayhouse.org" + }, { "domain": "hulu.com" }, @@ -1293,7 +1296,7 @@ }, "exceptions": [], "state": "enabled", - "hash": "b101ded240bc51fce0ece83191b2da62" + "hash": "4c62237a3eeaf9cfec814fc3fb7af282" }, "duckPlayer": { "exceptions": [], @@ -1670,10 +1673,6 @@ "selector": "[class*='container--ads']", "type": "hide-empty" }, - { - "selector": "[class*='l-ad']", - "type": "hide-empty" - }, { "selector": "[class*='page-ad']", "type": "hide-empty" @@ -1878,6 +1877,22 @@ "upgrade to flickr pro to hide these ads" ], "domains": [ + { + "domain": "3bmeteo.com", + "rules": [ + { + "type": "disable-default" + }, + { + "selector": "#admasthead", + "type": "hide-empty" + }, + { + "selector": "#ads_container", + "type": "hide-empty" + } + ] + }, { "domain": "abc.es", "rules": [ @@ -2655,6 +2670,22 @@ } ] }, + { + "domain": "kentonline.co.uk", + "rules": [ + { + "type": "disable-default" + }, + { + "selector": "[id*='p_mpu']", + "type": "closest-empty" + }, + { + "selector": "[id*='p_dmp']", + "type": "closest-empty" + } + ] + }, { "domain": "komputerswiat.pl", "rules": [ @@ -3254,6 +3285,18 @@ } ] }, + { + "domain": "startpagina.nl", + "rules": [ + { + "type": "disable-default" + }, + { + "selector": ".ad-widget", + "type": "closest-empty" + } + ] + }, { "domain": "takealot.com", "rules": [ @@ -3704,7 +3747,7 @@ ] }, "state": "enabled", - "hash": "c747ff47f18924f7ddde7cea3874e3bc" + "hash": "f7c00905a329790def09ac2296a0e1da" }, "exceptionHandler": { "exceptions": [ @@ -4024,9 +4067,6 @@ "gpc": { "state": "enabled", "exceptions": [ - { - "domain": "abcnews.go.com" - }, { "domain": "allegiantair.com" }, @@ -4079,7 +4119,7 @@ "privacy-test-pages.site" ] }, - "hash": "9f8ae6a01924a47b3ca6ce18f001cbd9" + "hash": "d11962aceb1417d05e8f2854d5fb72a9" }, "harmfulApis": { "settings": { @@ -4546,16 +4586,6 @@ } ] }, - "adserver.adtech.advertising.com": { - "rules": [ - { - "rule": "adserver.adtech.advertising.com/pubapi/3.0/1/54669.7/0/0/ADTECH;v=2;cmd=bid;cors=yes", - "domains": [ - "collider.com" - ] - } - ] - }, "adswizz.com": { "rules": [ { @@ -4584,6 +4614,16 @@ } ] }, + "advertising.com": { + "rules": [ + { + "rule": "adserver.adtech.advertising.com/pubapi/3.0/1/54669.7/0/0/ADTECH;v=2;cmd=bid;cors=yes", + "domains": [ + "collider.com" + ] + } + ] + }, "ahacdn.me": { "rules": [ { @@ -5106,6 +5146,16 @@ } ] }, + "datadoghq-browser-agent.com": { + "rules": [ + { + "rule": "www.datadoghq-browser-agent.com/datadog-logs-v4.js", + "domains": [ + "shapermint.com" + ] + } + ] + }, "datadome.co": { "rules": [ { @@ -5353,6 +5403,12 @@ }, "facebook.net": { "rules": [ + { + "rule": "connect.facebook.net/en_UK/sdk.js", + "domains": [ + "globalcyclingnetwork.com" + ] + }, { "rule": "connect.facebook.net/en_US/sdk.js", "domains": [ @@ -5624,6 +5680,7 @@ "rule": "imasdk.googleapis.com/js/sdkloader/ima3.js", "domains": [ "bloomberg.com", + "gamak.tv", "games.washingtonpost.com", "metro.co.uk", "nfl.com", @@ -5845,6 +5902,22 @@ } ] }, + "gorgias.chat": { + "rules": [ + { + "rule": "config.gorgias.chat", + "domains": [ + "help.athleticbrewing.com" + ] + }, + { + "rule": "assets.gorgias.chat", + "domains": [ + "help.athleticbrewing.com" + ] + } + ] + }, "greylabeldelivery.com": { "rules": [ { @@ -6132,17 +6205,6 @@ } ] }, - "live.primis.tech": { - "rules": [ - { - "rule": "live.primis.tech/live/liveView.php", - "domains": [ - "belfastlive.co.uk", - "cornwalllive.com" - ] - } - ] - }, "livechatinc.com": { "rules": [ { @@ -6482,6 +6544,17 @@ } ] }, + "primis.tech": { + "rules": [ + { + "rule": "live.primis.tech/live/liveView.php", + "domains": [ + "belfastlive.co.uk", + "cornwalllive.com" + ] + } + ] + }, "privacy-center.org": { "rules": [ { @@ -6611,7 +6684,8 @@ { "rule": "protection-widget.route.com/protect.core.js", "domains": [ - "littleunicorn.com" + "littleunicorn.com", + "olfactif.com" ] } ] @@ -6708,6 +6782,16 @@ } ] }, + "route.com": { + "rules": [ + { + "rule": "protection-widget.route.com/protect.core.js", + "domains": [ + "littleunicorn.com" + ] + } + ] + }, "rumble.com": { "rules": [ { @@ -6810,6 +6894,16 @@ } ] }, + "slickstream.com": { + "rules": [ + { + "rule": "app.slickstream.com", + "domains": [ + "" + ] + } + ] + }, "snapkit.com": { "rules": [ { @@ -6967,6 +7061,7 @@ { "rule": "widget.trustpilot.com/bootstrap/v5/tp.widget.bootstrap.min.js", "domains": [ + "azurestandard.com", "domesticandgeneral.com" ] } @@ -7284,7 +7379,7 @@ "domain": "sundancecatalog.com" } ], - "hash": "f5e54d051c76c97e2ebaf3014037d10a" + "hash": "1ce506662b48fccc1bf37a3133fd3f1e" }, "trackingCookies1p": { "settings": { diff --git a/Core/trackerData.json b/Core/trackerData.json index 84975e1a36..fb357bcf7f 100644 --- a/Core/trackerData.json +++ b/Core/trackerData.json @@ -1,7 +1,7 @@ { "_builtWith": { - "tracker-radar": "ae2fbc01abd26abf1903208a5cabbaed6a96ab2aa13779d2125a98fc45fee2cd-4013b4e91930c643394cb31c6c745356f133b04f", - "tracker-surrogates": "abd6067fac9693cc5a43d48931b111ca08cb0d5a" + "tracker-radar": "0928b2f5aba106ff5ff034b6901b3a3a06fdd6a6b14ef08ef3054c10a79a03e3-4013b4e91930c643394cb31c6c745356f133b04f", + "tracker-surrogates": "326805e7ed18b0bd2e176fc3d1095dfab3569995" }, "readme": "https://github.com/duckduckgo/tracker-blocklists", "trackers": { @@ -451,7 +451,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -462,7 +462,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -508,7 +508,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2396,7 +2396,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2407,7 +2407,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2451,7 +2451,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2462,7 +2462,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2596,7 +2596,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2735,7 +2735,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -2746,7 +2746,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3065,7 +3065,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3192,7 +3192,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3316,7 +3316,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3700,7 +3700,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3711,7 +3711,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3722,7 +3722,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3733,7 +3733,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3799,7 +3799,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3851,7 +3851,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3862,7 +3862,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -3999,7 +3999,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -4350,7 +4350,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -4385,7 +4385,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -4829,7 +4829,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -4840,7 +4840,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5042,7 +5042,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5084,7 +5084,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5107,7 +5107,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5142,7 +5142,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5171,7 +5171,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5459,7 +5459,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5576,7 +5576,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5587,7 +5587,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5598,7 +5598,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5609,7 +5609,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5646,7 +5646,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -5701,7 +5701,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -6237,7 +6237,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -6396,7 +6396,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -6712,7 +6712,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -6723,7 +6723,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -6847,7 +6847,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7043,7 +7043,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7079,7 +7079,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7090,7 +7090,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7101,7 +7101,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7684,7 +7684,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7695,7 +7695,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7706,7 +7706,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7787,7 +7787,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7910,7 +7910,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7921,7 +7921,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -7999,7 +7999,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8010,7 +8010,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8125,7 +8125,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8276,7 +8276,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8287,7 +8287,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8813,7 +8813,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8824,7 +8824,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -8865,7 +8865,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9281,7 +9281,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9886,7 +9886,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9897,7 +9897,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9908,7 +9908,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9948,7 +9948,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -9990,7 +9990,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10064,7 +10064,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10132,7 +10132,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10143,7 +10143,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10191,7 +10191,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10317,7 +10317,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10477,7 +10477,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10488,7 +10488,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10499,7 +10499,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10526,7 +10526,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10576,7 +10576,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -10623,7 +10623,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -11095,7 +11095,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -11135,7 +11135,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -11437,12 +11437,6 @@ "fingerprinting": 0, "cookies": 0.0000476, "comment": "pixel" - }, - { - "rule": "google\\.com\\/url", - "fingerprinting": 0, - "cookies": 0.0000272, - "comment": "pixel" } ] }, @@ -11873,7 +11867,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -11960,7 +11954,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -11971,7 +11965,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12198,7 +12192,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12238,7 +12232,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12249,7 +12243,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12260,7 +12254,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12271,7 +12265,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12597,7 +12591,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12608,7 +12602,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -12619,7 +12613,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -14528,7 +14522,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -15213,7 +15207,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -15288,7 +15282,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -15339,7 +15333,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16196,7 +16190,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16207,7 +16201,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16235,7 +16229,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16454,7 +16448,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16763,7 +16757,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16774,7 +16768,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -16959,7 +16953,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -17008,7 +17002,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -17282,7 +17276,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -17293,7 +17287,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -17856,7 +17850,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -18204,7 +18198,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -18343,7 +18337,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -18702,7 +18696,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -18938,7 +18932,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20127,7 +20121,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20348,7 +20342,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20359,7 +20353,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20370,7 +20364,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20510,7 +20504,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -20997,7 +20991,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21026,7 +21020,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21037,7 +21031,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21048,7 +21042,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21112,7 +21106,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21192,7 +21186,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21240,7 +21234,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21251,7 +21245,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21291,7 +21285,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21302,7 +21296,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21337,7 +21331,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21348,7 +21342,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21481,7 +21475,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -21565,7 +21559,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22036,7 +22030,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22047,7 +22041,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22058,7 +22052,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22128,7 +22122,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22139,7 +22133,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22292,7 +22286,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22303,7 +22297,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22345,7 +22339,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22356,7 +22350,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22367,7 +22361,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22637,7 +22631,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22648,7 +22642,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22709,7 +22703,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22767,7 +22761,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22778,7 +22772,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22878,7 +22872,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22901,7 +22895,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -22912,7 +22906,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23269,7 +23263,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23373,7 +23367,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23770,7 +23764,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23845,7 +23839,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23856,7 +23850,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23900,7 +23894,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23911,7 +23905,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23922,7 +23916,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -23933,7 +23927,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24013,7 +24007,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24046,7 +24040,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24097,7 +24091,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24233,7 +24227,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24362,7 +24356,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24373,7 +24367,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24620,7 +24614,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24631,7 +24625,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24642,7 +24636,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24923,7 +24917,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24958,7 +24952,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -24999,7 +24993,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25115,7 +25109,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25126,7 +25120,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25155,7 +25149,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25251,7 +25245,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25308,7 +25302,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25319,7 +25313,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25440,7 +25434,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25597,7 +25591,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25623,7 +25617,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25634,7 +25628,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25697,7 +25691,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25708,7 +25702,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25719,7 +25713,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25950,7 +25944,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25977,7 +25971,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25988,7 +25982,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -25999,7 +25993,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26029,7 +26023,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26040,7 +26034,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26068,7 +26062,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26079,7 +26073,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26167,7 +26161,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26215,7 +26209,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26226,7 +26220,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26237,7 +26231,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26248,7 +26242,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26259,7 +26253,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26270,7 +26264,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26342,7 +26336,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26353,7 +26347,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26407,7 +26401,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26609,7 +26603,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26917,7 +26911,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26928,7 +26922,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -26939,7 +26933,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -27190,7 +27184,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -27201,7 +27195,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -27619,7 +27613,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28476,7 +28470,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28606,7 +28600,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28617,7 +28611,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28750,7 +28744,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28833,7 +28827,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -28844,7 +28838,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -29204,7 +29198,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -29511,7 +29505,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -29522,7 +29516,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -29648,7 +29642,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -29659,7 +29653,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -31401,7 +31395,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -31690,7 +31684,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32850,7 +32844,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32861,7 +32855,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32872,7 +32866,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32883,7 +32877,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32894,7 +32888,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32905,7 +32899,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32916,7 +32910,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32927,7 +32921,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32938,7 +32932,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32949,7 +32943,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32960,7 +32954,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32971,7 +32965,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32982,7 +32976,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -32993,7 +32987,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33004,7 +32998,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33015,7 +33009,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33026,7 +33020,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33037,7 +33031,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33048,7 +33042,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33059,7 +33053,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33070,7 +33064,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33081,7 +33075,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33092,7 +33086,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33103,7 +33097,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33114,7 +33108,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33125,7 +33119,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33136,7 +33130,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "badgeboat.com": { + "domain": "badgeboat.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33147,7 +33152,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33158,7 +33163,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33169,7 +33174,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33180,7 +33185,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33191,7 +33196,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33202,7 +33207,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33213,7 +33218,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33224,7 +33229,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33235,7 +33240,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33246,7 +33251,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33257,7 +33262,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33268,7 +33273,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33279,7 +33284,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33290,7 +33295,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33301,7 +33306,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33312,7 +33317,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33323,7 +33328,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33334,7 +33339,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33345,7 +33350,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33356,7 +33361,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33367,7 +33372,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33378,7 +33383,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33389,7 +33394,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33400,7 +33405,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33411,7 +33416,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33422,7 +33427,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33433,7 +33438,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33444,7 +33449,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33455,7 +33460,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33466,7 +33471,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33477,7 +33482,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33488,7 +33493,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33499,7 +33504,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33510,7 +33515,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33521,7 +33526,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33532,7 +33537,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33543,7 +33548,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33554,7 +33559,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "cavecurtain.com": { + "domain": "cavecurtain.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33565,7 +33581,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "celestialspectra.com": { + "domain": "celestialspectra.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33576,7 +33603,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33587,7 +33614,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "chesscolor.com": { + "domain": "chesscolor.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33598,7 +33636,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33609,7 +33647,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33620,7 +33658,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33631,7 +33669,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33642,7 +33680,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33653,7 +33691,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33664,7 +33702,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33675,7 +33713,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33686,7 +33724,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33697,7 +33735,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33708,7 +33746,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33719,7 +33757,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33730,7 +33768,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33741,7 +33779,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33752,7 +33790,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33763,7 +33801,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33774,7 +33812,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33785,7 +33823,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33796,7 +33834,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33807,7 +33845,29 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "creatorcherry.com": { + "domain": "creatorcherry.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "creaturecabbage.com": { + "domain": "creaturecabbage.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33818,7 +33878,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33829,7 +33889,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33840,7 +33900,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33851,7 +33911,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33862,7 +33922,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33873,7 +33933,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33884,7 +33944,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33895,7 +33955,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33906,7 +33966,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33917,7 +33977,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33928,7 +33988,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33939,7 +33999,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33950,7 +34010,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "debonairtree.com": { + "domain": "debonairtree.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33961,7 +34032,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33972,7 +34043,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33983,7 +34054,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "defeatedbadge.com": { + "domain": "defeatedbadge.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -33994,7 +34076,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34005,7 +34087,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34016,7 +34098,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34027,7 +34109,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34038,7 +34120,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34049,7 +34131,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34060,7 +34142,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34071,7 +34153,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "dreamycanyon.com": { + "domain": "dreamycanyon.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34082,7 +34175,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "dustyhammer.com": { + "domain": "dustyhammer.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34093,7 +34197,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34104,7 +34208,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34115,7 +34219,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34126,7 +34230,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34137,7 +34241,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34148,7 +34252,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34159,7 +34263,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34170,7 +34274,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34181,7 +34285,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34192,7 +34296,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34203,7 +34307,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34214,7 +34318,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34225,7 +34329,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34236,7 +34340,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34247,7 +34351,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34258,7 +34362,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34269,7 +34373,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34280,7 +34384,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34291,7 +34395,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34302,7 +34406,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34313,7 +34417,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34324,7 +34428,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34335,7 +34439,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34346,7 +34450,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34357,7 +34461,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34368,7 +34472,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34379,7 +34483,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34390,7 +34494,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34401,7 +34505,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34412,7 +34516,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34423,7 +34527,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34434,7 +34538,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34445,7 +34549,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34456,7 +34560,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34467,7 +34571,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34478,7 +34582,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34489,7 +34593,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34500,7 +34604,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34511,7 +34615,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34522,7 +34626,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34533,7 +34637,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34544,7 +34648,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34555,7 +34659,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34566,7 +34670,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34577,7 +34681,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34588,7 +34692,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34599,7 +34703,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34610,7 +34714,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34621,7 +34725,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34632,7 +34736,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34643,7 +34747,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34654,7 +34758,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34665,7 +34769,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34676,7 +34780,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "haltingdivision.com": { + "domain": "haltingdivision.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34687,7 +34802,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34698,7 +34813,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34709,7 +34824,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34720,7 +34835,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34731,7 +34846,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34742,7 +34857,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34753,7 +34868,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34764,7 +34879,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34775,7 +34890,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34786,7 +34901,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34797,7 +34912,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34808,7 +34923,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34819,7 +34934,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34830,7 +34945,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34841,7 +34956,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34852,7 +34967,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34863,7 +34978,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34874,7 +34989,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34885,7 +35000,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34896,7 +35011,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34907,7 +35022,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34918,7 +35033,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34929,7 +35044,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34940,7 +35055,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34951,7 +35066,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34962,7 +35077,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34973,7 +35088,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34984,7 +35099,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -34995,7 +35110,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35006,7 +35121,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35017,7 +35132,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35028,7 +35143,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35039,7 +35154,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35050,7 +35165,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35061,7 +35176,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35072,7 +35187,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35083,7 +35198,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35094,7 +35209,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35105,7 +35220,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35116,7 +35231,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35127,7 +35242,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35138,7 +35253,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35149,7 +35264,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35160,7 +35275,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35171,7 +35286,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "meadowlullaby.com": { + "domain": "meadowlullaby.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35182,7 +35308,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35193,7 +35319,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35204,7 +35330,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35215,7 +35341,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35226,7 +35352,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35237,7 +35363,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35248,7 +35374,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35259,7 +35385,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35270,7 +35396,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35281,7 +35407,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35292,7 +35418,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35303,7 +35429,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35314,7 +35440,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35325,7 +35451,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35336,7 +35462,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35347,7 +35473,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35358,7 +35484,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35369,7 +35495,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35380,7 +35506,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35391,7 +35517,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35402,7 +35528,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35413,7 +35539,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35424,7 +35550,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35435,7 +35561,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35446,7 +35572,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35457,7 +35583,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35468,7 +35594,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35479,7 +35605,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35490,7 +35616,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35501,7 +35627,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35512,7 +35638,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35523,7 +35649,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35534,7 +35660,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35545,7 +35671,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35556,7 +35682,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35567,7 +35693,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35578,7 +35704,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35589,7 +35715,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35600,7 +35726,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "processplantation.com": { + "domain": "processplantation.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35611,7 +35748,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35622,7 +35759,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35633,7 +35770,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35644,7 +35781,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35655,7 +35792,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35666,7 +35803,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35677,7 +35814,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35688,7 +35825,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35699,7 +35836,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35710,7 +35847,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35721,7 +35858,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35732,7 +35869,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35743,7 +35880,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35754,7 +35891,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35765,7 +35902,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35776,7 +35913,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35787,7 +35924,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35798,7 +35935,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35809,7 +35946,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35820,7 +35957,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35831,7 +35968,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35842,7 +35979,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35853,7 +35990,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35864,7 +36001,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35875,7 +36012,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "rhymezebra.com": { + "domain": "rhymezebra.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35886,7 +36034,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35897,7 +36045,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35908,7 +36056,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35919,7 +36067,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35930,7 +36078,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35941,7 +36089,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35952,7 +36100,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35963,7 +36111,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35974,7 +36122,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35985,7 +36133,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -35996,7 +36144,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36007,7 +36155,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36018,7 +36166,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36029,7 +36177,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36040,7 +36188,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36051,7 +36199,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36062,7 +36210,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36073,7 +36221,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36084,7 +36232,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36095,7 +36243,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36106,7 +36254,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36117,7 +36265,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36128,7 +36276,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36139,7 +36287,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36150,7 +36298,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36161,7 +36309,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36172,7 +36320,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36183,7 +36331,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36194,7 +36342,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36205,7 +36353,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36216,7 +36364,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36227,7 +36375,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36238,7 +36386,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36249,7 +36397,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36260,7 +36408,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36271,7 +36419,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36282,7 +36430,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36293,7 +36441,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36304,7 +36452,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36315,7 +36463,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36326,7 +36474,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36337,7 +36485,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "solarislabyrinth.com": { + "domain": "solarislabyrinth.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36348,7 +36507,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36359,7 +36518,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "soothingglade.com": { + "domain": "soothingglade.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36370,7 +36540,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36381,7 +36551,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36392,7 +36562,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36403,7 +36573,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "spellmist.com": { + "domain": "spellmist.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36414,7 +36595,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36425,7 +36606,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36436,7 +36617,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36447,7 +36628,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36458,7 +36639,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36469,7 +36650,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36480,7 +36661,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36491,7 +36672,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36502,7 +36683,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36513,7 +36694,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36524,7 +36705,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36535,7 +36716,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36546,7 +36727,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "stockingsleet.com": { + "domain": "stockingsleet.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36557,7 +36749,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36568,7 +36760,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36579,7 +36771,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36590,7 +36782,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36601,7 +36793,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36612,7 +36804,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36623,7 +36815,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36634,7 +36826,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36645,7 +36837,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36656,7 +36848,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36667,7 +36859,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36678,7 +36870,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36689,7 +36881,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36700,7 +36892,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36711,7 +36903,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36722,7 +36914,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36733,7 +36925,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36744,7 +36936,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36755,7 +36947,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36766,7 +36958,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36777,7 +36969,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36788,7 +36980,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36799,7 +36991,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36810,7 +37002,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36821,7 +37013,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36832,7 +37024,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36843,7 +37035,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36854,7 +37046,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36865,7 +37057,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36876,7 +37068,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36887,7 +37079,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36898,7 +37090,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36909,7 +37101,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36920,7 +37112,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "tradetooth.com": { + "domain": "tradetooth.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36931,7 +37134,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36942,7 +37145,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36953,7 +37156,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36964,7 +37167,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36975,7 +37178,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36986,7 +37189,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -36997,7 +37200,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37008,7 +37211,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37019,7 +37222,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37030,7 +37233,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37041,7 +37244,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37052,7 +37255,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37063,7 +37266,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37074,7 +37277,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37085,7 +37288,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37096,7 +37299,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37107,7 +37310,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37118,7 +37321,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37129,7 +37332,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37140,7 +37343,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37151,7 +37354,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37162,7 +37365,18 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "vibranthaven.com": { + "domain": "vibranthaven.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37173,7 +37387,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37184,7 +37398,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37195,7 +37409,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37206,7 +37420,40 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "whimsicalgrove.com": { + "domain": "whimsicalgrove.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "whisperingcascade.com": { + "domain": "whisperingcascade.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, + "fingerprinting": 1, + "cookies": 0.01, + "default": "block" + }, + "whisperingsummit.com": { + "domain": "whisperingsummit.com", + "owner": { + "name": "Leven Labs, Inc. DBA Admiral", + "displayName": "Admiral" + }, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37217,7 +37464,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37228,7 +37475,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37239,7 +37486,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37250,7 +37497,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -37261,7 +37508,7 @@ "name": "Leven Labs, Inc. DBA Admiral", "displayName": "Admiral" }, - "prevalence": 0.0144, + "prevalence": 0.0145, "fingerprinting": 1, "cookies": 0.01, "default": "block" @@ -47322,6 +47569,7 @@ "awarealley.com", "awesomeagreement.com", "awzbijw.com", + "badgeboat.com", "badgevolcano.com", "bagbeam.com", "baitbaseball.com", @@ -47377,11 +47625,14 @@ "cautiouscamera.com", "cautiouscherries.com", "cautiouscredit.com", + "cavecurtain.com", "ceciliavenus.com", + "celestialspectra.com", "chalkoil.com", "chargecracker.com", "charmingplate.com", "cherriescare.com", + "chesscolor.com", "chickensstation.com", "childlikecrowd.com", "childlikeexample.com", @@ -47411,6 +47662,8 @@ "cozyhillside.com", "crabbychin.com", "cratecamera.com", + "creatorcherry.com", + "creaturecabbage.com", "crimsonmeadow.com", "critictruck.com", "crookedcreature.com", @@ -47432,10 +47685,12 @@ "daughterstone.com", "dazzlingbook.com", "debonairdust.com", + "debonairtree.com", "decisivebase.com", "decisivedrawer.com", "decisiveducks.com", "deerbeginner.com", + "defeatedbadge.com", "delicatecascade.com", "detailedkitten.com", "detectdiscovery.com", @@ -47451,7 +47706,9 @@ "dq95d35.com", "drainpaste.com", "dramaticdirection.com", + "dreamycanyon.com", "dustydime.com", + "dustyhammer.com", "elasticchange.com", "elderlybean.com", "encouragingthread.com", @@ -47533,6 +47790,7 @@ "gustygrandmother.com", "hallowedinvention.com", "haltingbadge.com", + "haltingdivision.com", "haltinggold.com", "hammerhearing.com", "handsomehose.com", @@ -47594,6 +47852,7 @@ "materialisticmoon.com", "materialparcel.com", "materialplayground.com", + "meadowlullaby.com", "measlymiddle.com", "meatydime.com", "meddleplant.com", @@ -47660,6 +47919,7 @@ "prepareplanes.com", "priceypies.com", "pricklydebt.com", + "processplantation.com", "profusesupport.com", "protestcopy.com", "psychedelicarithmetic.com", @@ -47703,6 +47963,7 @@ "retrievemint.com", "rhetoricalloss.com", "rhetoricalveil.com", + "rhymezebra.com", "richstring.com", "righteouscrayon.com", "rightfulfall.com", @@ -47775,15 +48036,18 @@ "smoggysnakes.com", "smoggysongs.com", "soggysponge.com", + "solarislabyrinth.com", "somberscarecrow.com", "sombersticks.com", "songsterritory.com", + "soothingglade.com", "sordidsmile.com", "soretrain.com", "sortsail.com", "sortsummer.com", "soundstocking.com", "spectacularstamp.com", + "spellmist.com", "spellsalsa.com", "spookyexchange.com", "spookyskate.com", @@ -47808,6 +48072,7 @@ "stingycrush.com", "stingyshoe.com", "stingyspoon.com", + "stockingsleet.com", "stomachscience.com", "straightnest.com", "strangeclocks.com", @@ -47859,6 +48124,7 @@ "tidymitten.com", "tiredthroat.com", "tiresomethunder.com", + "tradetooth.com", "tranquilcanyon.com", "tremendousearthquake.com", "tremendousplastic.com", @@ -47888,6 +48154,7 @@ "venusgloria.com", "verdantanswer.com", "verseballs.com", + "vibranthaven.com", "virtualvincent.com", "volatilevessel.com", "voraciousgrip.com", @@ -47896,6 +48163,9 @@ "warmquiver.com", "wearbasin.com", "wellgroomedhydrant.com", + "whimsicalgrove.com", + "whisperingcascade.com", + "whisperingsummit.com", "whispermeeting.com", "wildcommittee.com", "workoperation.com", @@ -47903,7 +48173,7 @@ "zipperxray.com", "zlp6s.pw" ], - "prevalence": 0.0144, + "prevalence": 0.0145, "displayName": "Admiral" } }, @@ -48662,6 +48932,7 @@ "awarealley.com": "Leven Labs, Inc. DBA Admiral", "awesomeagreement.com": "Leven Labs, Inc. DBA Admiral", "awzbijw.com": "Leven Labs, Inc. DBA Admiral", + "badgeboat.com": "Leven Labs, Inc. DBA Admiral", "badgevolcano.com": "Leven Labs, Inc. DBA Admiral", "bagbeam.com": "Leven Labs, Inc. DBA Admiral", "baitbaseball.com": "Leven Labs, Inc. DBA Admiral", @@ -48717,11 +48988,14 @@ "cautiouscamera.com": "Leven Labs, Inc. DBA Admiral", "cautiouscherries.com": "Leven Labs, Inc. DBA Admiral", "cautiouscredit.com": "Leven Labs, Inc. DBA Admiral", + "cavecurtain.com": "Leven Labs, Inc. DBA Admiral", "ceciliavenus.com": "Leven Labs, Inc. DBA Admiral", + "celestialspectra.com": "Leven Labs, Inc. DBA Admiral", "chalkoil.com": "Leven Labs, Inc. DBA Admiral", "chargecracker.com": "Leven Labs, Inc. DBA Admiral", "charmingplate.com": "Leven Labs, Inc. DBA Admiral", "cherriescare.com": "Leven Labs, Inc. DBA Admiral", + "chesscolor.com": "Leven Labs, Inc. DBA Admiral", "chickensstation.com": "Leven Labs, Inc. DBA Admiral", "childlikecrowd.com": "Leven Labs, Inc. DBA Admiral", "childlikeexample.com": "Leven Labs, Inc. DBA Admiral", @@ -48751,6 +49025,8 @@ "cozyhillside.com": "Leven Labs, Inc. DBA Admiral", "crabbychin.com": "Leven Labs, Inc. DBA Admiral", "cratecamera.com": "Leven Labs, Inc. DBA Admiral", + "creatorcherry.com": "Leven Labs, Inc. DBA Admiral", + "creaturecabbage.com": "Leven Labs, Inc. DBA Admiral", "crimsonmeadow.com": "Leven Labs, Inc. DBA Admiral", "critictruck.com": "Leven Labs, Inc. DBA Admiral", "crookedcreature.com": "Leven Labs, Inc. DBA Admiral", @@ -48772,10 +49048,12 @@ "daughterstone.com": "Leven Labs, Inc. DBA Admiral", "dazzlingbook.com": "Leven Labs, Inc. DBA Admiral", "debonairdust.com": "Leven Labs, Inc. DBA Admiral", + "debonairtree.com": "Leven Labs, Inc. DBA Admiral", "decisivebase.com": "Leven Labs, Inc. DBA Admiral", "decisivedrawer.com": "Leven Labs, Inc. DBA Admiral", "decisiveducks.com": "Leven Labs, Inc. DBA Admiral", "deerbeginner.com": "Leven Labs, Inc. DBA Admiral", + "defeatedbadge.com": "Leven Labs, Inc. DBA Admiral", "delicatecascade.com": "Leven Labs, Inc. DBA Admiral", "detailedkitten.com": "Leven Labs, Inc. DBA Admiral", "detectdiscovery.com": "Leven Labs, Inc. DBA Admiral", @@ -48791,7 +49069,9 @@ "dq95d35.com": "Leven Labs, Inc. DBA Admiral", "drainpaste.com": "Leven Labs, Inc. DBA Admiral", "dramaticdirection.com": "Leven Labs, Inc. DBA Admiral", + "dreamycanyon.com": "Leven Labs, Inc. DBA Admiral", "dustydime.com": "Leven Labs, Inc. DBA Admiral", + "dustyhammer.com": "Leven Labs, Inc. DBA Admiral", "elasticchange.com": "Leven Labs, Inc. DBA Admiral", "elderlybean.com": "Leven Labs, Inc. DBA Admiral", "encouragingthread.com": "Leven Labs, Inc. DBA Admiral", @@ -48873,6 +49153,7 @@ "gustygrandmother.com": "Leven Labs, Inc. DBA Admiral", "hallowedinvention.com": "Leven Labs, Inc. DBA Admiral", "haltingbadge.com": "Leven Labs, Inc. DBA Admiral", + "haltingdivision.com": "Leven Labs, Inc. DBA Admiral", "haltinggold.com": "Leven Labs, Inc. DBA Admiral", "hammerhearing.com": "Leven Labs, Inc. DBA Admiral", "handsomehose.com": "Leven Labs, Inc. DBA Admiral", @@ -48934,6 +49215,7 @@ "materialisticmoon.com": "Leven Labs, Inc. DBA Admiral", "materialparcel.com": "Leven Labs, Inc. DBA Admiral", "materialplayground.com": "Leven Labs, Inc. DBA Admiral", + "meadowlullaby.com": "Leven Labs, Inc. DBA Admiral", "measlymiddle.com": "Leven Labs, Inc. DBA Admiral", "meatydime.com": "Leven Labs, Inc. DBA Admiral", "meddleplant.com": "Leven Labs, Inc. DBA Admiral", @@ -49000,6 +49282,7 @@ "prepareplanes.com": "Leven Labs, Inc. DBA Admiral", "priceypies.com": "Leven Labs, Inc. DBA Admiral", "pricklydebt.com": "Leven Labs, Inc. DBA Admiral", + "processplantation.com": "Leven Labs, Inc. DBA Admiral", "profusesupport.com": "Leven Labs, Inc. DBA Admiral", "protestcopy.com": "Leven Labs, Inc. DBA Admiral", "psychedelicarithmetic.com": "Leven Labs, Inc. DBA Admiral", @@ -49043,6 +49326,7 @@ "retrievemint.com": "Leven Labs, Inc. DBA Admiral", "rhetoricalloss.com": "Leven Labs, Inc. DBA Admiral", "rhetoricalveil.com": "Leven Labs, Inc. DBA Admiral", + "rhymezebra.com": "Leven Labs, Inc. DBA Admiral", "richstring.com": "Leven Labs, Inc. DBA Admiral", "righteouscrayon.com": "Leven Labs, Inc. DBA Admiral", "rightfulfall.com": "Leven Labs, Inc. DBA Admiral", @@ -49115,15 +49399,18 @@ "smoggysnakes.com": "Leven Labs, Inc. DBA Admiral", "smoggysongs.com": "Leven Labs, Inc. DBA Admiral", "soggysponge.com": "Leven Labs, Inc. DBA Admiral", + "solarislabyrinth.com": "Leven Labs, Inc. DBA Admiral", "somberscarecrow.com": "Leven Labs, Inc. DBA Admiral", "sombersticks.com": "Leven Labs, Inc. DBA Admiral", "songsterritory.com": "Leven Labs, Inc. DBA Admiral", + "soothingglade.com": "Leven Labs, Inc. DBA Admiral", "sordidsmile.com": "Leven Labs, Inc. DBA Admiral", "soretrain.com": "Leven Labs, Inc. DBA Admiral", "sortsail.com": "Leven Labs, Inc. DBA Admiral", "sortsummer.com": "Leven Labs, Inc. DBA Admiral", "soundstocking.com": "Leven Labs, Inc. DBA Admiral", "spectacularstamp.com": "Leven Labs, Inc. DBA Admiral", + "spellmist.com": "Leven Labs, Inc. DBA Admiral", "spellsalsa.com": "Leven Labs, Inc. DBA Admiral", "spookyexchange.com": "Leven Labs, Inc. DBA Admiral", "spookyskate.com": "Leven Labs, Inc. DBA Admiral", @@ -49148,6 +49435,7 @@ "stingycrush.com": "Leven Labs, Inc. DBA Admiral", "stingyshoe.com": "Leven Labs, Inc. DBA Admiral", "stingyspoon.com": "Leven Labs, Inc. DBA Admiral", + "stockingsleet.com": "Leven Labs, Inc. DBA Admiral", "stomachscience.com": "Leven Labs, Inc. DBA Admiral", "straightnest.com": "Leven Labs, Inc. DBA Admiral", "strangeclocks.com": "Leven Labs, Inc. DBA Admiral", @@ -49199,6 +49487,7 @@ "tidymitten.com": "Leven Labs, Inc. DBA Admiral", "tiredthroat.com": "Leven Labs, Inc. DBA Admiral", "tiresomethunder.com": "Leven Labs, Inc. DBA Admiral", + "tradetooth.com": "Leven Labs, Inc. DBA Admiral", "tranquilcanyon.com": "Leven Labs, Inc. DBA Admiral", "tremendousearthquake.com": "Leven Labs, Inc. DBA Admiral", "tremendousplastic.com": "Leven Labs, Inc. DBA Admiral", @@ -49228,6 +49517,7 @@ "venusgloria.com": "Leven Labs, Inc. DBA Admiral", "verdantanswer.com": "Leven Labs, Inc. DBA Admiral", "verseballs.com": "Leven Labs, Inc. DBA Admiral", + "vibranthaven.com": "Leven Labs, Inc. DBA Admiral", "virtualvincent.com": "Leven Labs, Inc. DBA Admiral", "volatilevessel.com": "Leven Labs, Inc. DBA Admiral", "voraciousgrip.com": "Leven Labs, Inc. DBA Admiral", @@ -49236,6 +49526,9 @@ "warmquiver.com": "Leven Labs, Inc. DBA Admiral", "wearbasin.com": "Leven Labs, Inc. DBA Admiral", "wellgroomedhydrant.com": "Leven Labs, Inc. DBA Admiral", + "whimsicalgrove.com": "Leven Labs, Inc. DBA Admiral", + "whisperingcascade.com": "Leven Labs, Inc. DBA Admiral", + "whisperingsummit.com": "Leven Labs, Inc. DBA Admiral", "whispermeeting.com": "Leven Labs, Inc. DBA Admiral", "wildcommittee.com": "Leven Labs, Inc. DBA Admiral", "workoperation.com": "Leven Labs, Inc. DBA Admiral", diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 6dd202dfe1..489a3abd77 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -7858,7 +7858,7 @@ CODE_SIGN_ENTITLEMENTS = PacketTunnelProvider/PacketTunnelProvider.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -7895,7 +7895,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7987,7 +7987,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -8014,7 +8014,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8160,7 +8160,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8184,7 +8184,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGo.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; INFOPLIST_FILE = DuckDuckGo/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -8248,7 +8248,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = NO; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Widgets/Info.plist; @@ -8283,7 +8283,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8317,7 +8317,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = OpenAction/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -8347,7 +8347,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8633,7 +8633,7 @@ CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAlpha.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8659,7 +8659,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8691,7 +8691,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8728,7 +8728,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; @@ -8764,7 +8764,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = HKE973VLUW; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8799,11 +8799,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 2; + DYLIB_CURRENT_VERSION = 0; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -8977,11 +8977,11 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 2; + DYLIB_CURRENT_VERSION = 0; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -9010,10 +9010,10 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 2; + DYLIB_CURRENT_VERSION = 0; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Core/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/DuckDuckGo/Settings.bundle/Root.plist b/DuckDuckGo/Settings.bundle/Root.plist index cb5e57cf93..4af486a5a5 100644 --- a/DuckDuckGo/Settings.bundle/Root.plist +++ b/DuckDuckGo/Settings.bundle/Root.plist @@ -6,7 +6,7 @@ DefaultValue - 7.97.1 + 7.99.0 Key version Title From 59dbb74d10ae5f0bd842b1a5c093dbfc4a604589 Mon Sep 17 00:00:00 2001 From: Christopher Brind Date: Wed, 29 Nov 2023 13:10:15 +0000 Subject: [PATCH 7/7] update theme to use system colours (#2180) --- ...essBarPositionSettingsViewController.swift | 1 - .../AutoClearSettingsViewController.swift | 1 - DuckDuckGo/AutocompleteViewController.swift | 4 +- ...ofillLoginSettingsListViewController.swift | 15 ++++ DuckDuckGo/Base.lproj/Bookmarks.storyboard | 5 +- DuckDuckGo/Base.lproj/LaunchScreen.storyboard | 15 ++-- DuckDuckGo/BookmarkDetailsCell.swift | 2 - DuckDuckGo/BookmarksViewControllerCells.swift | 2 - DuckDuckGo/DarkTheme.swift | 71 ++----------------- DuckDuckGo/FeedbackPickerViewController.swift | 1 - ...uttonAnimationSettingsViewController.swift | 1 - DuckDuckGo/LightTheme.swift | 69 ++---------------- DuckDuckGo/SettingsViewController.swift | 9 --- DuckDuckGo/Theme+DesignSystem.swift | 58 +++++++++++++++ DuckDuckGo/Theme.swift | 29 ++------ DuckDuckGo/ThemeManager.swift | 6 +- DuckDuckGo/ThemeSettingsViewController.swift | 1 - .../UnprotectedSitesViewController.swift | 1 - 18 files changed, 104 insertions(+), 187 deletions(-) diff --git a/DuckDuckGo/AddressBarPositionSettingsViewController.swift b/DuckDuckGo/AddressBarPositionSettingsViewController.swift index b7df80ab5e..34d8a466f4 100644 --- a/DuckDuckGo/AddressBarPositionSettingsViewController.swift +++ b/DuckDuckGo/AddressBarPositionSettingsViewController.swift @@ -43,7 +43,6 @@ class AddressBarPositionSettingsViewController: UITableViewController { override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) cell.tintColor = theme.buttonTintColor cell.textLabel?.textColor = theme.tableCellTextColor diff --git a/DuckDuckGo/AutoClearSettingsViewController.swift b/DuckDuckGo/AutoClearSettingsViewController.swift index f46a1ccf1d..6f4363ff2d 100644 --- a/DuckDuckGo/AutoClearSettingsViewController.swift +++ b/DuckDuckGo/AutoClearSettingsViewController.swift @@ -114,7 +114,6 @@ class AutoClearSettingsViewController: UITableViewController { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) // Checkmark color cell.tintColor = theme.buttonTintColor diff --git a/DuckDuckGo/AutocompleteViewController.swift b/DuckDuckGo/AutocompleteViewController.swift index cc13fc7ead..caa9e5b35a 100644 --- a/DuckDuckGo/AutocompleteViewController.swift +++ b/DuckDuckGo/AutocompleteViewController.swift @@ -237,8 +237,7 @@ extension AutocompleteViewController: UITableViewDataSource { cell.backgroundColor = backgroundColor cell.tintColor = currentTheme.autocompleteCellAccessoryColor - cell.setHighlightedStateBackgroundColor(currentTheme.tableCellHighlightedBackgroundColor) - + return cell } @@ -255,7 +254,6 @@ extension AutocompleteViewController: UITableViewDataSource { cell.tintColor = currentTheme.autocompleteCellAccessoryColor cell.label?.textColor = currentTheme.tableCellTextColor - cell.setHighlightedStateBackgroundColor(currentTheme.tableCellHighlightedBackgroundColor) return cell } diff --git a/DuckDuckGo/AutofillLoginSettingsListViewController.swift b/DuckDuckGo/AutofillLoginSettingsListViewController.swift index aa1966ef0f..3c7d0f86a8 100644 --- a/DuckDuckGo/AutofillLoginSettingsListViewController.swift +++ b/DuckDuckGo/AutofillLoginSettingsListViewController.swift @@ -552,6 +552,21 @@ extension AutofillLoginSettingsListViewController: UITableViewDelegate { return 0 } } + + func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection: Int) { + if let view = view as? UITableViewHeaderFooterView { + let theme = ThemeManager.shared.currentTheme + view.textLabel?.textColor = theme.tableHeaderTextColor + } + } + + func tableView(_ tableView: UITableView, willDisplayFooterView view: UIView, forSection: Int) { + if let view = view as? UITableViewHeaderFooterView { + let theme = ThemeManager.shared.currentTheme + view.textLabel?.textColor = theme.tableHeaderTextColor + } + } + } // MARK: UITableViewDataSource diff --git a/DuckDuckGo/Base.lproj/Bookmarks.storyboard b/DuckDuckGo/Base.lproj/Bookmarks.storyboard index 8db08cb51a..cf28e50f78 100644 --- a/DuckDuckGo/Base.lproj/Bookmarks.storyboard +++ b/DuckDuckGo/Base.lproj/Bookmarks.storyboard @@ -561,10 +561,10 @@ - + - + @@ -587,7 +587,6 @@ - diff --git a/DuckDuckGo/Base.lproj/LaunchScreen.storyboard b/DuckDuckGo/Base.lproj/LaunchScreen.storyboard index 6f667974a3..b1af175bf8 100644 --- a/DuckDuckGo/Base.lproj/LaunchScreen.storyboard +++ b/DuckDuckGo/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,10 @@ - + - + + @@ -25,11 +26,11 @@ - + - + @@ -47,5 +48,11 @@ + + + + + + diff --git a/DuckDuckGo/BookmarkDetailsCell.swift b/DuckDuckGo/BookmarkDetailsCell.swift index 6e037b3a46..c6cc3dce9b 100644 --- a/DuckDuckGo/BookmarkDetailsCell.swift +++ b/DuckDuckGo/BookmarkDetailsCell.swift @@ -52,12 +52,10 @@ class BookmarkDetailsCell: UITableViewCell { @IBOutlet weak var titleTextField: UITextField! @IBOutlet weak var urlTextField: UITextField! @IBOutlet weak var faviconImageView: UIImageView! - @IBOutlet weak var seperatorViewHeight: NSLayoutConstraint! func setUp() { selectionStyle = .none - seperatorViewHeight.constant = 1.0 / UIScreen.main.scale titleTextField.becomeFirstResponder() titleTextField.removeTarget(self, action: #selector(textFieldDidChange(_:)), for: .editingChanged) diff --git a/DuckDuckGo/BookmarksViewControllerCells.swift b/DuckDuckGo/BookmarksViewControllerCells.swift index 7cb16c799b..27b231fe19 100644 --- a/DuckDuckGo/BookmarksViewControllerCells.swift +++ b/DuckDuckGo/BookmarksViewControllerCells.swift @@ -76,7 +76,6 @@ class BookmarksViewControllerCellFactory { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor cell.titleLabel.textColor = theme.tableCellTextColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) cell.favoriteImageView.tintColor = UIColor(designSystemColor: .icons) cell.editingAccessoryType = .disclosureIndicator return cell @@ -91,7 +90,6 @@ class BookmarksViewControllerCellFactory { cell.backgroundColor = theme.tableCellBackgroundColor cell.titleLabel.textColor = theme.tableCellTextColor cell.childrenCountLabel.textColor = theme.tableCellTextColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) cell.editingAccessoryType = .disclosureIndicator return cell } diff --git a/DuckDuckGo/DarkTheme.swift b/DuckDuckGo/DarkTheme.swift index 52ec2eece9..6ca267eba7 100644 --- a/DuckDuckGo/DarkTheme.swift +++ b/DuckDuckGo/DarkTheme.swift @@ -32,93 +32,34 @@ struct DarkTheme: Theme { var tabsBarBackgroundColor = UIColor.black var tabsBarSeparatorColor = UIColor.darkGreyish - var navigationBarTitleColor = UIColor.white var navigationBarTintColor = UIColor.lightMercury - - var tintOnBlurColor = UIColor.white - - var searchBarBackgroundColor = UIColor.charcoalGrey + var centeredSearchBarBackgroundColor = UIColor.nearlyBlackLight - var searchBarTextColor = UIColor.white var searchBarTextDeemphasisColor = UIColor.lightMercury - var searchBarBorderColor = UIColor.darkGreyish - var searchBarClearTextIconColor = UIColor.greyish2 - var searchBarVoiceSearchIconColor = UIColor.greyish2 - - var browsingMenuTextColor = UIColor.white - var browsingMenuIconsColor = UIColor.gray20 - var browsingMenuSeparatorColor = UIColor.charcoalGrey - var browsingMenuHighlightColor = UIColor.darkGreyish - - var progressBarGradientDarkColor = UIColor.orange - var progressBarGradientLightColor = UIColor.orangeLight - - var autocompleteSuggestionTextColor = UIColor.white - var autocompleteCellAccessoryColor = UIColor.lightMercury + var browsingMenuHighlightColor = UIColor.darkGreyish + var tableCellSelectedColor = UIColor.charcoalGrey - var tableCellSeparatorColor = UIColor.charcoalGrey - var tableCellTextColor = UIColor.lightGreyish - var tableCellAccessoryTextColor = UIColor.greyish var tableCellAccessoryColor = UIColor.greyish3 var tableCellHighlightedBackgroundColor = UIColor.greyishBrown - var tableHeaderTextColor = UIColor.greyish3 var tabSwitcherCellBorderColor = UIColor.white var tabSwitcherCellTextColor = UIColor.white var tabSwitcherCellSecondaryTextColor = UIColor.lightMercury - - var iconCellBorderColor = UIColor.lightGreyish - - var buttonTintColor = UIColor.cornflowerBlue - var placeholderColor = UIColor.greyish - - var textFieldBackgroundColor = UIColor.nearlyBlackLight - var textFieldFontColor = UIColor.white - + var homeRowPrimaryTextColor = UIColor.white var homeRowSecondaryTextColor = UIColor.lightMercury var homeRowBackgroundColor = UIColor.nearlyBlackLight var homePrivacyCellTextColor = UIColor.white var homePrivacyCellSecondaryTextColor = UIColor.greyish3 - - var aboutScreenTextColor = UIColor.white - var aboutScreenButtonColor = UIColor.cornflowerBlue - + var favoritesPlusTintColor = UIColor.greyish3 var favoritesPlusBackgroundColor = UIColor.greyishBrown2 - var faviconBackgroundColor = UIColor.charcoalGrey - var favoriteTextColor = UIColor.greyish - - var feedbackPrimaryTextColor = UIColor.white - var feedbackSecondaryTextColor = UIColor.lightGreyish - var feedbackSentimentButtonBackgroundColor = UIColor.charcoalGrey - - var privacyReportCellBackgroundColor = UIColor.nearlyBlackLight - var activityStyle: UIActivityIndicatorView.Style = .medium var destructiveColor: UIColor = UIColor.destructive - - var ddgTextTintColor: UIColor = .white - - var daxDialogBackgroundColor: UIColor = .nearlyBlackLight - var daxDialogTextColor: UIColor = UIColor.nearlyWhite - - var homeMessageBackgroundColor = UIColor.nearlyBlackLight - var homeMessageHeaderTextColor = UIColor.white - var homeMessageSubheaderTextColor = UIColor.greyish2 - var homeMessageTopTextColor = UIColor.cornflowerBlue - var homeMessageButtonColor = UIColor.cornflowerBlue - var homeMessageButtonTextColor = UIColor.white - var homeMessageDismissButtonColor = UIColor.white - - var autofillDefaultTitleTextColor = UIColor.white - var autofillDefaultSubtitleTextColor = UIColor.lightMercury - var autofillEmptySearchViewTextColor = UIColor.gray20 - var autofillLockedViewTextColor = UIColor.lightMercury - var privacyDashboardWebviewBackgroundColor = UIColor.nearlyBlackLight + var searchBarBackgroundColor: UIColor = UIColor.charcoalGrey } diff --git a/DuckDuckGo/FeedbackPickerViewController.swift b/DuckDuckGo/FeedbackPickerViewController.swift index 898f0d095a..96169a4169 100644 --- a/DuckDuckGo/FeedbackPickerViewController.swift +++ b/DuckDuckGo/FeedbackPickerViewController.swift @@ -117,7 +117,6 @@ class FeedbackPickerViewController: UITableViewController { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor cell.textLabel?.textColor = theme.tableCellTextColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) let text = cell.textLabel?.attributedText?.mutableCopy() as? NSMutableAttributedString text?.mutableString.setString(entries[indexPath.row].userText) diff --git a/DuckDuckGo/FireButtonAnimationSettingsViewController.swift b/DuckDuckGo/FireButtonAnimationSettingsViewController.swift index b96853515e..94b2ae8cd9 100644 --- a/DuckDuckGo/FireButtonAnimationSettingsViewController.swift +++ b/DuckDuckGo/FireButtonAnimationSettingsViewController.swift @@ -49,7 +49,6 @@ class FireButtonAnimationSettingsViewController: UITableViewController { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) // Checkmark color cell.tintColor = theme.buttonTintColor diff --git a/DuckDuckGo/LightTheme.swift b/DuckDuckGo/LightTheme.swift index 465680947a..7c90ed2b5d 100644 --- a/DuckDuckGo/LightTheme.swift +++ b/DuckDuckGo/LightTheme.swift @@ -33,94 +33,33 @@ struct LightTheme: Theme { var tabsBarBackgroundColor = UIColor.gray20 var tabsBarSeparatorColor = UIColor.greyish - - var navigationBarTitleColor = UIColor.nearlyBlackLight var navigationBarTintColor = UIColor.darkGreyish - var tintOnBlurColor = UIColor.white - - var searchBarBackgroundColor = UIColor.lightGreyish - var centeredSearchBarBackgroundColor = UIColor.mercury - var searchBarTextColor = UIColor.nearlyBlackLight var searchBarTextDeemphasisColor = UIColor.greyish3 - var searchBarBorderColor = UIColor.lightGreyish - var searchBarClearTextIconColor = UIColor.greyish2 - var searchBarVoiceSearchIconColor = UIColor.greyish2 - - var browsingMenuTextColor = UIColor.nearlyBlack - var browsingMenuIconsColor = UIColor.nearlyBlackLight - var browsingMenuSeparatorColor = UIColor.mercury - var browsingMenuHighlightColor = UIColor.lightGreyish - - var progressBarGradientDarkColor = UIColor.cornflowerBlue - var progressBarGradientLightColor = UIColor.skyBlueLight - var autocompleteSuggestionTextColor = UIColor.black - var autocompleteCellAccessoryColor = UIColor.darkGreyish + var browsingMenuHighlightColor = UIColor.lightGreyish var tableCellSelectedColor = UIColor.mercury - var tableCellSeparatorColor = UIColor(white: 0, alpha: 0.09) - var tableCellTextColor = UIColor.darkGreyish - var tableCellAccessoryTextColor = UIColor.greyish3 var tableCellAccessoryColor = UIColor.greyish var tableCellHighlightedBackgroundColor = UIColor.mercury - var tableHeaderTextColor = UIColor.greyish3 var tabSwitcherCellBorderColor = UIColor.nearlyBlackLight var tabSwitcherCellTextColor = UIColor.black var tabSwitcherCellSecondaryTextColor = UIColor.greyishBrown2 - - var iconCellBorderColor = UIColor.darkGreyish - var buttonTintColor = UIColor.cornflowerBlue - var placeholderColor = UIColor.greyish3 - - var textFieldBackgroundColor = UIColor.white - var textFieldFontColor = UIColor.nearlyBlackLight - var homeRowPrimaryTextColor = UIColor.nearlyBlackLight var homeRowSecondaryTextColor = UIColor.greyishBrown2 var homeRowBackgroundColor = UIColor.nearlyWhiteLight var homePrivacyCellTextColor = UIColor.charcoalGrey var homePrivacyCellSecondaryTextColor = UIColor.greyish3 - - var aboutScreenTextColor = UIColor.charcoalGrey - var aboutScreenButtonColor = UIColor.cornflowerBlue - + var favoritesPlusTintColor = UIColor.greyish3 var favoritesPlusBackgroundColor = UIColor.lightMercury - - var faviconBackgroundColor = UIColor.white - var favoriteTextColor = UIColor.darkGreyish - - var feedbackPrimaryTextColor = UIColor.nearlyBlackLight - var feedbackSecondaryTextColor = UIColor.nearlyBlackLight - var feedbackSentimentButtonBackgroundColor = UIColor.white - - var privacyReportCellBackgroundColor = UIColor.white - + var activityStyle: UIActivityIndicatorView.Style = .medium var destructiveColor: UIColor = UIColor.destructive - - var ddgTextTintColor: UIColor = UIColor.nearlyBlackLight - - var daxDialogBackgroundColor: UIColor = UIColor.white - var daxDialogTextColor: UIColor = UIColor.darkGreyish - - var homeMessageBackgroundColor = UIColor.white - var homeMessageHeaderTextColor = UIColor.black - var homeMessageSubheaderTextColor = UIColor.greyish3 - var homeMessageTopTextColor = UIColor.cornflowerBlue - var homeMessageButtonColor = UIColor.cornflowerBlue - var homeMessageButtonTextColor = UIColor.white - var homeMessageDismissButtonColor = UIColor.nearlyBlackLight - - var autofillDefaultTitleTextColor = UIColor.nearlyBlack - var autofillDefaultSubtitleTextColor = UIColor.greyishBrown2 - var autofillEmptySearchViewTextColor = UIColor.gray50 - var autofillLockedViewTextColor = UIColor.nearlyBlack - var privacyDashboardWebviewBackgroundColor = UIColor.white + var searchBarBackgroundColor: UIColor = UIColor.lightGreyish } diff --git a/DuckDuckGo/SettingsViewController.swift b/DuckDuckGo/SettingsViewController.swift index 0f52a73f5a..42bc7ae375 100644 --- a/DuckDuckGo/SettingsViewController.swift +++ b/DuckDuckGo/SettingsViewController.swift @@ -510,17 +510,8 @@ class SettingsViewController: UITableViewController { } override func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) { - let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) - - if cell.accessoryType == .disclosureIndicator { - let accesoryImage = UIImageView(image: UIImage(named: "DisclosureIndicator")) - accesoryImage.frame = CGRect(x: 0, y: 0, width: 8, height: 13) - accesoryImage.tintColor = theme.tableCellAccessoryColor - cell.accessoryView = accesoryImage - } } override func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection: Int) { diff --git a/DuckDuckGo/Theme+DesignSystem.swift b/DuckDuckGo/Theme+DesignSystem.swift index f52d2e923e..d496616332 100644 --- a/DuckDuckGo/Theme+DesignSystem.swift +++ b/DuckDuckGo/Theme+DesignSystem.swift @@ -33,4 +33,62 @@ extension Theme { var tabSwitcherCellBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } var searchBarTextPlaceholderColor: UIColor { UIColor(designSystemColor: .textSecondary) } + // New: + var autocompleteCellAccessoryColor: UIColor { UIColor(designSystemColor: .icons) } + + var autofillDefaultTitleTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var autofillDefaultSubtitleTextColor: UIColor { UIColor(designSystemColor: .textSecondary) } + var autofillEmptySearchViewTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var autofillLockedViewTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + + var ddgTextTintColor: UIColor { UIColor(designSystemColor: .textPrimary) } + + var privacyDashboardWebviewBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } + + var iconCellBorderColor: UIColor { UIColor(designSystemColor: .icons) } + + var browsingMenuTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var browsingMenuIconsColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var browsingMenuSeparatorColor: UIColor { UIColor(designSystemColor: .lines) } + + var feedbackSentimentButtonBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } + + var aboutScreenButtonColor: UIColor { UIColor(designSystemColor: .accent) } + + var tabSwitcherCellBorderColor: UIColor { UIColor(designSystemColor: .surface) } + var tabSwitcherCellTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var tabSwitcherCellSecondaryTextColor: UIColor { UIColor(designSystemColor: .textSecondary) } + + var textFieldFontColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var textFieldBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } + + var buttonTintColor: UIColor { UIColor(designSystemColor: .accent) } + + var feedbackPrimaryTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var feedbackSecondaryTextColor: UIColor { UIColor(designSystemColor: .textSecondary) } + + var progressBarGradientDarkColor: UIColor { UIColor(designSystemColor: .accent) } + var progressBarGradientLightColor: UIColor { UIColor(designSystemColor: .accent) } + + var daxDialogBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } + var daxDialogTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + + var placeholderColor: UIColor { UIColor(designSystemColor: .textSecondary) } + var searchBarTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + + var navigationBarTitleColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var tableHeaderTextColor: UIColor {UIColor(designSystemColor: .textSecondary) } + + var faviconBackgroundColor: UIColor { UIColor(designSystemColor: .surface) } + + var favoriteTextColor: UIColor { UIColor(designSystemColor: .textSecondary) } + var aboutScreenTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var autocompleteSuggestionTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + + var tableCellTextColor: UIColor { UIColor(designSystemColor: .textPrimary) } + var tableCellSeparatorColor: UIColor { UIColor(designSystemColor: .lines) } + + // No design system colour yet, so fall back to SDK colours + var tableCellAccessoryTextColor: UIColor { .secondaryLabel } + } diff --git a/DuckDuckGo/Theme.swift b/DuckDuckGo/Theme.swift index 063920f72e..e145c51444 100644 --- a/DuckDuckGo/Theme.swift +++ b/DuckDuckGo/Theme.swift @@ -46,18 +46,11 @@ protocol Theme { var navigationBarTitleColor: UIColor { get } var navigationBarTintColor: UIColor { get } - // Color of the content that is directly placed over blurred background - var tintOnBlurColor: UIColor { get } - var searchBarBackgroundColor: UIColor { get } - var centeredSearchBarBackgroundColor: UIColor { get } var searchBarTextColor: UIColor { get } var searchBarTextPlaceholderColor: UIColor { get } var searchBarTextDeemphasisColor: UIColor { get } - var searchBarBorderColor: UIColor { get } - var searchBarClearTextIconColor: UIColor { get } - var searchBarVoiceSearchIconColor: UIColor { get } - + var browsingMenuTextColor: UIColor { get } var browsingMenuIconsColor: UIColor { get } var browsingMenuBackgroundColor: UIColor { get } @@ -69,7 +62,7 @@ protocol Theme { var autocompleteSuggestionTextColor: UIColor { get } var autocompleteCellAccessoryColor: UIColor { get } - + var tableCellBackgroundColor: UIColor { get } var tableCellSelectedColor: UIColor { get } var tableCellSeparatorColor: UIColor { get } @@ -102,17 +95,13 @@ protocol Theme { var aboutScreenTextColor: UIColor { get } var aboutScreenButtonColor: UIColor { get } - var favoritesPlusTintColor: UIColor { get } - var favoritesPlusBackgroundColor: UIColor { get } var faviconBackgroundColor: UIColor { get } var favoriteTextColor: UIColor { get } var feedbackPrimaryTextColor: UIColor { get } var feedbackSecondaryTextColor: UIColor { get } var feedbackSentimentButtonBackgroundColor: UIColor { get } - - var privacyReportCellBackgroundColor: UIColor { get } - + var activityStyle: UIActivityIndicatorView.Style { get } var destructiveColor: UIColor { get } @@ -121,17 +110,7 @@ protocol Theme { var daxDialogBackgroundColor: UIColor { get } var daxDialogTextColor: UIColor { get } - - var homeMessageBackgroundColor: UIColor { get } - var homeMessageHeaderTextColor: UIColor { get } - var homeMessageSubheaderTextColor: UIColor { get } - var homeMessageTopTextColor: UIColor { get } - var homeMessageButtonColor: UIColor { get } - var homeMessageButtonTextColor: UIColor { get } - var homeMessageDismissButtonColor: UIColor { get } - - var autofillDefaultTitleTextColor: UIColor { get } - var autofillDefaultSubtitleTextColor: UIColor { get } + var autofillEmptySearchViewTextColor: UIColor { get } var autofillLockedViewTextColor: UIColor { get } diff --git a/DuckDuckGo/ThemeManager.swift b/DuckDuckGo/ThemeManager.swift index a788a252b8..1a764b755e 100644 --- a/DuckDuckGo/ThemeManager.swift +++ b/DuckDuckGo/ThemeManager.swift @@ -57,8 +57,9 @@ class ThemeManager { } } } - - private static func makeTheme(name: ThemeName) -> Theme { + + public static func makeTheme(name: ThemeName) -> Theme { + switch name { case .systemDefault: return obtainSystemTheme() @@ -66,7 +67,6 @@ class ThemeManager { return DarkTheme() case .light: return LightTheme() - } } diff --git a/DuckDuckGo/ThemeSettingsViewController.swift b/DuckDuckGo/ThemeSettingsViewController.swift index 4879cca3a2..81a0a874e1 100644 --- a/DuckDuckGo/ThemeSettingsViewController.swift +++ b/DuckDuckGo/ThemeSettingsViewController.swift @@ -55,7 +55,6 @@ class ThemeSettingsViewController: UITableViewController { let theme = ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) // Checkmark color cell.tintColor = theme.buttonTintColor diff --git a/DuckDuckGo/UnprotectedSitesViewController.swift b/DuckDuckGo/UnprotectedSitesViewController.swift index 94a1c03d5c..9a25969853 100644 --- a/DuckDuckGo/UnprotectedSitesViewController.swift +++ b/DuckDuckGo/UnprotectedSitesViewController.swift @@ -222,7 +222,6 @@ class UnprotectedSitesViewController: UITableViewController { let theme = enforceLightTheme ? LightTheme() : ThemeManager.shared.currentTheme cell.backgroundColor = theme.tableCellBackgroundColor - cell.setHighlightedStateBackgroundColor(theme.tableCellHighlightedBackgroundColor) return cell }