Skip to content

Use shared instance of PublicSuffixDatabase #7428

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
lmac012 wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −7
Open

Use shared instance of PublicSuffixDatabase #7428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ad-click/ad-click-impl/src/main/java/com/duckduckgo/adclick/impl/DuckDuckGoAdClickManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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?) {
Expand Down
3 changes: 1 addition & 2 deletions common/common-utils/src/main/java/com/duckduckgo/common/utils/extensions/StringExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
}

/**
Expand Down
3 changes: 1 addition & 2 deletions ...impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/RequestDataViewStateMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ interface RequestDataViewStateMapper {
@ContributesBinding(AppScope::class)
class AppSiteRequestDataViewStateMapper @Inject constructor() : RequestDataViewStateMapper {

private val publicSuffixDatabase = PublicSuffixDatabase()
private val allowedCategories = listOf(
"Analytics",
"Advertising",
Expand Down Expand Up @@ -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()
}
}
Loading