Skip to content

Commit 991e53b

Browse files
committed
Address comments from PR
1 parent 0cf5b0a commit 991e53b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3219,7 +3219,7 @@ class BrowserTabViewModel @Inject constructor(
32193219

32203220
if (!exempted) {
32213221
if (currentBrowserViewState().maliciousSiteDetected && previousSite?.url == url.toString()) return
3222-
Timber.tag("Cris").d("Received MaliciousSiteWarning for $url, feed: $feed, exempted: false, clientSideHit: $clientSideHit")
3222+
Timber.d("Received MaliciousSiteWarning for $url, feed: $feed, exempted: false, clientSideHit: $clientSideHit")
32233223
val params = mapOf(CATEGORY_KEY to feed.name.lowercase(), CLIENT_SIDE_HIT_KEY to clientSideHit.toString())
32243224
pixel.fire(AppPixelName.MALICIOUS_SITE_PROTECTION_ERROR_SHOWN, params)
32253225
loadingViewState.postValue(

app/src/main/java/com/duckduckgo/app/browser/webview/MaliciousSiteBlockerWebViewIntegration.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ class RealMaliciousSiteBlockerWebViewIntegration @Inject constructor(
141141
return IsMaliciousViewData.Safe
142142
}
143143

144-
Timber.d("shouldIntercept ${request.url}")
145-
146144
val url = request.url.let {
147145
if (it.fragment != null) {
148146
it.buildUpon().fragment(null).build()
@@ -269,7 +267,7 @@ class RealMaliciousSiteBlockerWebViewIntegration @Inject constructor(
269267
} else {
270268
Safe
271269
}
272-
processedUrls[url] = isMalicious
270+
processedUrls[url] = it
273271
confirmationCallback(isMalicious)
274272
}
275273
}

app/src/test/java/com/duckduckgo/app/browser/webview/RealMaliciousSiteBlockerWebViewIntegrationTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ class RealMaliciousSiteBlockerWebViewIntegrationTest {
264264
val firstCallbackResult = firstCallbackDeferred.await()
265265
val secondCallbackResult = secondCallbackDeferred.await()
266266

267+
assertTrue(testee.processedUrls[maliciousUri.toString()] is Malicious)
267268
assertEquals(false, firstCallbackResult)
268269
assertEquals(true, secondCallbackResult)
269270
}

malicious-site-protection/malicious-site-protection-impl/src/main/kotlin/com/duckduckgo/malicioussiteprotection/impl/data/MaliciousSiteRepository.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ interface MaliciousSiteRepository {
5656
suspend fun loadHashPrefixes(): Result<Unit>
5757
}
5858

59+
private const val MATCHES_ENDPOINT_TIMEOUT = 1000L
60+
5961
@ContributesBinding(AppScope::class)
6062
@SingleInstanceIn(AppScope::class)
6163
class RealMaliciousSiteRepository @Inject constructor(
@@ -84,7 +86,7 @@ class RealMaliciousSiteRepository @Inject constructor(
8486

8587
override suspend fun matches(hashPrefix: String): List<Match> {
8688
return try {
87-
withTimeout(1000) {
89+
withTimeout(MATCHES_ENDPOINT_TIMEOUT) {
8890
maliciousSiteService.getMatches(hashPrefix).matches.mapNotNull {
8991
val feed = when (it.feed.uppercase()) {
9092
PHISHING.name -> PHISHING

0 commit comments

Comments
 (0)