-
Notifications
You must be signed in to change notification settings - Fork 937
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Suppress report autofill breakage prompt after previous submission
- Loading branch information
Showing
12 changed files
with
350 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...rc/main/java/com/duckduckgo/autofill/impl/reporting/AutofillBreakageReportCanShowRules.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright (c) 2024 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.autofill.impl.reporting | ||
|
|
||
| import com.duckduckgo.autofill.impl.reporting.remoteconfig.AutofillSiteBreakageReportingFeature | ||
| import com.duckduckgo.autofill.impl.time.TimeProvider | ||
| import com.duckduckgo.autofill.impl.urlmatcher.AutofillUrlMatcher | ||
| import com.duckduckgo.autofill.store.reporting.AutofillSiteBreakageReportingFeatureRepository | ||
| import com.duckduckgo.common.utils.DispatcherProvider | ||
| import com.duckduckgo.di.scopes.AppScope | ||
| import com.squareup.anvil.annotations.ContributesBinding | ||
| import java.util.concurrent.TimeUnit | ||
| import javax.inject.Inject | ||
| import kotlinx.coroutines.withContext | ||
|
|
||
| interface AutofillBreakageReportCanShowRules { | ||
| suspend fun canShowForSite(url: String): Boolean | ||
| } | ||
|
|
||
| @ContributesBinding(AppScope::class) | ||
| class AutofillBreakageReportCanShowRulesImpl @Inject constructor( | ||
| private val reportBreakageFeature: AutofillSiteBreakageReportingFeature, | ||
| private val exceptionsRepository: AutofillSiteBreakageReportingFeatureRepository, | ||
| private val dispatchers: DispatcherProvider, | ||
| private val urlMatcher: AutofillUrlMatcher, | ||
| private val dataStore: AutofillSiteBreakageReportingDataStore, | ||
| private val timeProvider: TimeProvider, | ||
|
|
||
| ) : AutofillBreakageReportCanShowRules { | ||
|
|
||
| override suspend fun canShowForSite(url: String): Boolean { | ||
| return withContext(dispatchers.io()) { | ||
| if (!featureEnabledInRemoteConfig()) return@withContext false | ||
|
|
||
| val eTldPlusOne = urlMatcher.extractUrlPartsForAutofill(url).eTldPlus1 ?: return@withContext false | ||
|
|
||
| if (eTldPlusOne.isInExceptionList()) return@withContext false | ||
| if (eTldPlusOne.siteReportSentRecently()) return@withContext false | ||
|
|
||
| true | ||
| } | ||
| } | ||
|
|
||
| private fun String.isInExceptionList() = exceptionsRepository.exceptions.contains(this) | ||
| private fun featureEnabledInRemoteConfig() = reportBreakageFeature.self().isEnabled() | ||
| private suspend fun String.siteReportSentRecently(): Boolean { | ||
| val lastSubmissionForSite = dataStore.getTimestampLastFeedbackSent(this) ?: return false | ||
| val minDaysBeforeResubmissionAllowed = dataStore.getMinimumNumberOfDaysBeforeReportPromptReshown() | ||
|
|
||
| val timeSinceReportMs = timeProvider.currentTimeMillis() - lastSubmissionForSite | ||
| return timeSinceReportMs <= TimeUnit.DAYS.toMillis(minDaysBeforeResubmissionAllowed.toLong()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/time/TimeProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright (c) 2024 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.autofill.impl.time | ||
|
|
||
| import com.duckduckgo.di.scopes.AppScope | ||
| import com.squareup.anvil.annotations.ContributesBinding | ||
| import javax.inject.Inject | ||
|
|
||
| interface TimeProvider { | ||
| fun currentTimeMillis(): Long | ||
| } | ||
|
|
||
| @ContributesBinding(AppScope::class) | ||
| class SystemCurrentTimeProvider @Inject constructor() : TimeProvider { | ||
| override fun currentTimeMillis(): Long = System.currentTimeMillis() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
...java/com/duckduckgo/autofill/impl/reporting/AutofillBreakageReportCanShowRulesImplTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package com.duckduckgo.autofill.impl.reporting | ||
|
|
||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import com.duckduckgo.autofill.impl.encoding.UrlUnicodeNormalizerImpl | ||
| import com.duckduckgo.autofill.impl.time.TimeProvider | ||
| import com.duckduckgo.autofill.impl.urlmatcher.AutofillDomainNameUrlMatcher | ||
| import com.duckduckgo.autofill.store.reporting.AutofillSiteBreakageReportingFeatureRepository | ||
| import com.duckduckgo.common.test.CoroutineTestRule | ||
| import com.duckduckgo.feature.toggles.api.toggle.AutofillReportBreakageTestFeature | ||
| import java.util.concurrent.TimeUnit.DAYS | ||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.kotlin.any | ||
| import org.mockito.kotlin.mock | ||
| import org.mockito.kotlin.whenever | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class AutofillBreakageReportCanShowRulesImplTest { | ||
|
|
||
| @get:Rule | ||
| val coroutineTestRule: CoroutineTestRule = CoroutineTestRule() | ||
|
|
||
| private val urlMatcher = AutofillDomainNameUrlMatcher(UrlUnicodeNormalizerImpl()) | ||
| private val dataStore: AutofillSiteBreakageReportingDataStore = mock() | ||
| private val remoteFeature = AutofillReportBreakageTestFeature() | ||
| private val exceptionsRepository: AutofillSiteBreakageReportingFeatureRepository = mock() | ||
| private val timeProvider: TimeProvider = mock() | ||
|
|
||
| private val testee = AutofillBreakageReportCanShowRulesImpl( | ||
| reportBreakageFeature = remoteFeature, | ||
| dispatchers = coroutineTestRule.testDispatcherProvider, | ||
| urlMatcher = urlMatcher, | ||
| dataStore = dataStore, | ||
| exceptionsRepository = exceptionsRepository, | ||
| timeProvider = timeProvider, | ||
| ) | ||
|
|
||
| @Before | ||
| fun setup() = runTest { | ||
| remoteFeature.topLevelFeatureEnabled = true | ||
| whenever(exceptionsRepository.exceptions).thenReturn(emptyList()) | ||
| whenever(dataStore.getMinimumNumberOfDaysBeforeReportPromptReshown()).thenReturn(10) | ||
| whenever(timeProvider.currentTimeMillis()).thenReturn(System.currentTimeMillis()) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenFeatureIsDisabledThenCannotShowPrompt() = runTest { | ||
| remoteFeature.topLevelFeatureEnabled = false | ||
| assertFalse(testee.canShowForSite(aSite())) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenETldPlusOneNotExtractableThenCannotShowPrompt() = runTest { | ||
| assertFalse(testee.canShowForSite("")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenSiteInExceptionsListThenCannotShowPrompt() = runTest { | ||
| whenever(exceptionsRepository.exceptions).thenReturn(listOf("example.com")) | ||
| assertFalse(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenSiteWasRecentlySubmittedAlreadyThenCannotShowPrompt() = runTest { | ||
| whenever(dataStore.getTimestampLastFeedbackSent(any())).thenReturn(10L) | ||
| whenever(timeProvider.currentTimeMillis()).thenReturn(20L) | ||
| assertFalse(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenSiteWasSubmittedAtThresholdThenCannotShowPrompt() = runTest { | ||
| whenever(dataStore.getTimestampLastFeedbackSent(any())).thenReturn(0L) | ||
| whenever(dataStore.getMinimumNumberOfDaysBeforeReportPromptReshown()).thenReturn(42) | ||
| whenever(timeProvider.currentTimeMillis()).thenReturn(DAYS.toMillis(42)) | ||
| assertFalse(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenSiteWasSubmittedAtOneMsBeyondThresholdThenCanShowPrompt() = runTest { | ||
| whenever(dataStore.getTimestampLastFeedbackSent(any())).thenReturn(0L) | ||
| whenever(dataStore.getMinimumNumberOfDaysBeforeReportPromptReshown()).thenReturn(42) | ||
| whenever(timeProvider.currentTimeMillis()).thenReturn(DAYS.toMillis(42) + 1) | ||
| assertTrue(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenAnotherSiteWasRecentlySubmittedThenCanShowPrompt() = runTest { | ||
| whenever(dataStore.getTimestampLastFeedbackSent("foo.com")).thenReturn(10L) | ||
| whenever(timeProvider.currentTimeMillis()).thenReturn(20L) | ||
| assertTrue(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenSiteWasSubmittedBeforeButNotRecentlyThenCanShowPrompt() = runTest { | ||
| whenever(dataStore.getTimestampLastFeedbackSent(any())).thenReturn(0L) | ||
| assertTrue(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| @Test | ||
| fun whenNoGoodReasonNotToThenCanShowPrompt() = runTest { | ||
| assertTrue(testee.canShowForSite("example.com")) | ||
| } | ||
|
|
||
| private fun aSite(): String = "example.com" | ||
| } |
Oops, something went wrong.