diff --git a/ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt b/ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt index c088aae9b5d8..bc7857c48777 100644 --- a/ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt +++ b/ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt @@ -37,8 +37,6 @@ class DuckDuckGoAdClickManager @Inject constructor( private val adClickCollector: AdClickCollector, ) : AdClickManager { - private val publicSuffixDatabase = PublicSuffixDatabase() - override fun detectAdClick(url: String?, isMainFrame: Boolean) { if (url == null) return if (!isMainFrame) return @@ -132,7 +130,7 @@ class DuckDuckGoAdClickManager @Inject constructor( private fun toTldPlusOne(url: String): String? { val urlAdDomain = UriString.host(url) if (urlAdDomain.isNullOrEmpty()) return urlAdDomain - return kotlin.runCatching { publicSuffixDatabase.getEffectiveTldPlusOne(urlAdDomain) }.getOrNull() + return kotlin.runCatching { PublicSuffixDatabase.get().getEffectiveTldPlusOne(urlAdDomain) }.getOrNull() } private fun adClicked(detectedAdDomain: String?) { diff --git a/common/common-utils/src/main/java/com/duckduckgo/common/utils/extensions/StringExtensions.kt b/common/common-utils/src/main/java/com/duckduckgo/common/utils/extensions/StringExtensions.kt index 28273b3bbd75..9005b0858b0c 100644 --- a/common/common-utils/src/main/java/com/duckduckgo/common/utils/extensions/StringExtensions.kt +++ b/common/common-utils/src/main/java/com/duckduckgo/common/utils/extensions/StringExtensions.kt @@ -45,7 +45,6 @@ private fun htmlDrawable( private const val HTTPS_PREFIX = "https://" private const val WWW_PREFIX = "www." private const val WWW_SUFFIX = "/" -private val publicSuffixDatabase = PublicSuffixDatabase() fun String.websiteFromGeoLocationsApiOrigin(): String { val uri = Uri.parse(this) @@ -60,7 +59,7 @@ fun String.asLocationPermissionOrigin(): String { } fun String.toTldPlusOne(): String? { - return runCatching { publicSuffixDatabase.getEffectiveTldPlusOne(this) }.getOrNull() + return runCatching { PublicSuffixDatabase.get().getEffectiveTldPlusOne(this) }.getOrNull() } /** diff --git a/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/RequestDataViewStateMapper.kt b/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/RequestDataViewStateMapper.kt index cbc8be3c4181..eb018f74583f 100644 --- a/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/RequestDataViewStateMapper.kt +++ b/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/RequestDataViewStateMapper.kt @@ -48,7 +48,6 @@ interface RequestDataViewStateMapper { @ContributesBinding(AppScope::class) class AppSiteRequestDataViewStateMapper @Inject constructor() : RequestDataViewStateMapper { - private val publicSuffixDatabase = PublicSuffixDatabase() private val allowedCategories = listOf( "Analytics", "Advertising", @@ -123,6 +122,6 @@ class AppSiteRequestDataViewStateMapper @Inject constructor() : RequestDataViewS private fun toTldPlusOne(url: String): String? { val urlAdDomain = UriString.host(url) if (urlAdDomain.isNullOrEmpty()) return urlAdDomain - return kotlin.runCatching { publicSuffixDatabase.getEffectiveTldPlusOne(urlAdDomain) }.getOrNull() + return kotlin.runCatching { PublicSuffixDatabase.get().getEffectiveTldPlusOne(urlAdDomain) }.getOrNull() } }