Do not show prompt on DDG sites

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -151,7 +151,7 @@ class CtaViewModelTest {
         whenever(mockDuckPlayer.getUserPreferences()).thenReturn(UserPreferences(false, AlwaysAsk))
         whenever(mockDuckPlayer.isYouTubeUrl(any())).thenReturn(false)
         whenever(mockDuckPlayer.isSimulatedYoutubeNoCookie(any())).thenReturn(false)
-        whenever(mockBrokenSitePrompt.shouldShowBrokenSitePrompt()).thenReturn(false)
+        whenever(mockBrokenSitePrompt.shouldShowBrokenSitePrompt(any())).thenReturn(false)
         whenever(mockBrokenSitePrompt.isFeatureEnabled()).thenReturn(false)
 
         testee = CtaViewModel(
@@ -180,26 +180,26 @@ class CtaViewModelTest {
     }
 
     @Test
-    fun whenCtaShownAndCtaIsDaxAndCanNotSendPixelThenPixelIsNotFired() {
+    fun whenCtaShownAndCtaIsDaxAndCanNotSendPixelThenPixelIsNotFired() = runTest {
         testee.onCtaShown(DaxBubbleCta.DaxIntroSearchOptionsCta(mockOnboardingStore, mockAppInstallStore))
         verify(mockPixel, never()).fire(eq(SURVEY_CTA_SHOWN), any(), any(), eq(Count))
     }
 
     @Test
-    fun whenCtaShownAndCtaIsDaxAndCanSendPixelThenPixelIsFired() {
+    fun whenCtaShownAndCtaIsDaxAndCanSendPixelThenPixelIsFired() = runTest {
         whenever(mockOnboardingStore.onboardingDialogJourney).thenReturn("s:0")
         testee.onCtaShown(DaxBubbleCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore))
         verify(mockPixel, never()).fire(eq(SURVEY_CTA_SHOWN), any(), any(), eq(Count))
     }
 
     @Test
-    fun whenCtaShownAndCtaIsNotDaxThenPixelIsFired() {
+    fun whenCtaShownAndCtaIsNotDaxThenPixelIsFired() = runTest {
         testee.onCtaShown(HomePanelCta.AddWidgetAuto)
         verify(mockPixel).fire(eq(WIDGET_CTA_SHOWN), any(), any(), eq(Count))
     }
 
     @Test
-    fun whenCtaLaunchedPixelIsFired() {
+    fun whenCtaLaunchedPixelIsFired() = runTest {
         testee.onUserClickCtaOkButton(HomePanelCta.AddWidgetAuto)
         verify(mockPixel).fire(eq(WIDGET_CTA_LAUNCHED), any(), any(), eq(Count))
     }
@@ -284,7 +284,7 @@ class CtaViewModelTest {
     @Test
     fun whenRefreshCtaWhileBrowsingAndHideTipsIsTrueAndShouldShowBrokenSitePromptThenReturnBrokenSitePrompt() = runTest {
         whenever(mockSettingsDataStore.hideTips).thenReturn(true)
-        whenever(mockBrokenSitePrompt.shouldShowBrokenSitePrompt()).thenReturn(true)
+        whenever(mockBrokenSitePrompt.shouldShowBrokenSitePrompt(any())).thenReturn(true)
         val site = site(url = "http://www.facebook.com", entity = TestEntity("Facebook", "Facebook", 9.0))
 
         val value = testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = true, site = site)
@@ -685,14 +685,14 @@ class CtaViewModelTest {
     }
 
     @Test
-    fun whenCtaShownIfCtaIsNotMarkedAsReadOnShowThenCtaNotInsertedInDatabase() {
+    fun whenCtaShownIfCtaIsNotMarkedAsReadOnShowThenCtaNotInsertedInDatabase() = runTest {
         testee.onCtaShown(OnboardingDaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore))
 
         verify(mockDismissedCtaDao, never()).insert(DismissedCta(CtaId.DAX_DIALOG_SERP))
     }
 
     @Test
-    fun whenCtaShownIfCtaIsMarkedAsReadOnShowThenCtaInsertedInDatabase() {
+    fun whenCtaShownIfCtaIsMarkedAsReadOnShowThenCtaInsertedInDatabase() = runTest {
         testee.onCtaShown(OnboardingDaxDialogCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore, mockSettingsDataStore))
 
         verify(mockDismissedCtaDao).insert(DismissedCta(CtaId.DAX_END))

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

@@ -2661,7 +2661,9 @@ class BrowserTabViewModel @Inject constructor(
     }
 
     fun onUserClickCtaOkButton(cta: Cta) {
-        ctaViewModel.onUserClickCtaOkButton(cta)
+        viewModelScope.launch {
+            ctaViewModel.onUserClickCtaOkButton(cta)
+        }
         val onboardingCommand = when (cta) {
             is HomePanelCta.AddWidgetAuto, is HomePanelCta.AddWidgetInstructions -> LaunchAddWidget
             is OnboardingDaxDialogCta -> onOnboardingCtaOkButtonClicked(cta)
@@ -3423,7 +3425,6 @@ class BrowserTabViewModel @Inject constructor(
     }
 
     private fun onBrokenSiteCtaDismissButtonClicked(cta: BrokenSitePromptDialogCta): Command? {
-        onUserDismissedCta(cta)
         viewModelScope.launch {
             command.value = HideBrokenSitePromptCta(cta)
         }

app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt

@@ -117,7 +117,7 @@ class CtaViewModel @Inject constructor(
         }
     }
 
-    fun onCtaShown(cta: Cta) {
+    suspend fun onCtaShown(cta: Cta) {
         cta.shownPixel?.let {
             val canSendPixel = when (cta) {
                 is DaxCta -> cta.canSendShownPixel()
@@ -130,6 +130,10 @@ class CtaViewModel @Inject constructor(
         if (cta is OnboardingDaxDialogCta && cta.markAsReadOnShow) {
             dismissedCtaDao.insert(DismissedCta(cta.ctaId))
         }
+
+        if (cta is BrokenSitePromptDialogCta) {
+            brokenSitePrompt.ctaShown()
+        }
     }
 
     suspend fun registerDaxBubbleCtaDismissed(cta: Cta) {
@@ -150,6 +154,10 @@ class CtaViewModel @Inject constructor(
 
     suspend fun onUserDismissedCta(cta: Cta) {
         withContext(dispatchers.io()) {
+            if (cta is BrokenSitePromptDialogCta) {
+                brokenSitePrompt.userDismissedPrompt()
+            }
+
             cta.cancelPixel?.let {
                 pixel.fire(it, cta.pixelCancelParameters())
             }
@@ -160,10 +168,14 @@ class CtaViewModel @Inject constructor(
         }
     }
 
-    fun onUserClickCtaOkButton(cta: Cta) {
+    suspend fun onUserClickCtaOkButton(cta: Cta) {
         cta.okPixel?.let {
             pixel.fire(it, cta.pixelOkParameters())
         }
+
+        if (cta is BrokenSitePromptDialogCta) {
+            brokenSitePrompt.userAcceptedPrompt()
+        }
     }
 
     suspend fun refreshCta(
@@ -303,7 +315,7 @@ class CtaViewModel @Inject constructor(
             }
 
             if (!canShowOnboardingDaxDialogCta()) {
-                return if (withContext(dispatchers.io()) { brokenSitePrompt.shouldShowBrokenSitePrompt() }) {
+                return if (brokenSitePrompt.shouldShowBrokenSitePrompt(nonNullSite.url)) {
                     BrokenSitePromptDialogCta()
                 } else {
                     null

broken-site/broken-site-api/src/main/java/com/duckduckgo/brokensite/api/BrokenSitePrompt.kt

@@ -32,5 +32,7 @@ interface BrokenSitePrompt {
 
     fun getUserRefreshesCount(): Int
 
-    suspend fun shouldShowBrokenSitePrompt(): Boolean
+    suspend fun shouldShowBrokenSitePrompt(url: String): Boolean
+
+    suspend fun ctaShown()
 }

broken-site/broken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSitePomptDataStore.kt

@@ -20,6 +20,7 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.brokensite.impl.SharedPreferencesDuckPlayerDataStore.Keys.COOL_DOWN_DAYS
@@ -47,8 +48,8 @@ interface BrokenSitePomptDataStore {
     suspend fun setDismissStreakResetDays(days: Int)
     suspend fun getDismissStreakResetDays(): Int
 
-    suspend fun setCoolDownDays(days: Int)
-    suspend fun getCoolDownDays(): Int
+    suspend fun setCoolDownDays(days: Long)
+    suspend fun getCoolDownDays(): Long
     suspend fun setDismissStreak(streak: Int)
     suspend fun getDismissStreak(): Int
     suspend fun setNextShownDate(nextShownDate: LocalDate?)
@@ -65,7 +66,7 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
     private object Keys {
         val MAX_DISMISS_STREAK = intPreferencesKey(name = "MAX_DISMISS_STREAK")
         val DISMISS_STREAK_RESET_DAYS = intPreferencesKey(name = "DISMISS_STREAK_RESET_DAYS")
-        val COOL_DOWN_DAYS = intPreferencesKey(name = "COOL_DOWN_DAYS")
+        val COOL_DOWN_DAYS = longPreferencesKey(name = "COOL_DOWN_DAYS")
         val DISMISS_STREAK = intPreferencesKey(name = "DISMISS_STREAK")
         val NEXT_SHOWN_DATE = stringPreferencesKey(name = "NEXT_SHOWN_DATE")
     }
@@ -84,11 +85,10 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
         }
         .distinctUntilChanged()
 
-    private val coolDownDays: Flow<Int> = store.data
+    private val coolDownDays: Flow<Long> = store.data
         .map { prefs ->
             prefs[COOL_DOWN_DAYS] ?: 7
         }
-        .distinctUntilChanged()
 
     private val dismissStreak: Flow<Int> = store.data
         .map { prefs ->
@@ -114,11 +114,11 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
 
     override suspend fun getDismissStreakResetDays(): Int = dismissStreakResetDays.first()
 
-    override suspend fun setCoolDownDays(days: Int) {
+    override suspend fun setCoolDownDays(days: Long) {
         store.edit { prefs -> prefs[COOL_DOWN_DAYS] = days }
     }
 
-    override suspend fun getCoolDownDays(): Int = coolDownDays.first()
+    override suspend fun getCoolDownDays(): Long = coolDownDays.first()
 
     override suspend fun setDismissStreak(streak: Int) {
         store.edit { prefs -> prefs[DISMISS_STREAK] = streak }

broken-site/broken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSiteReportRepository.kt

@@ -45,8 +45,8 @@ interface BrokenSiteReportRepository {
     suspend fun setDismissStreakResetDays(days: Int)
     suspend fun getDismissStreakResetDays(): Int
 
-    suspend fun setCoolDownDays(days: Int)
-    suspend fun getCoolDownDays(): Int
+    suspend fun setCoolDownDays(days: Long)
+    suspend fun getCoolDownDays(): Long
 
     suspend fun setBrokenSitePromptRCSettings(maxDismissStreak: Int, dismissStreakResetDays: Int, coolDownDays: Int)
 
@@ -56,6 +56,7 @@ interface BrokenSiteReportRepository {
     suspend fun incrementDismissStreak()
     suspend fun getDismissStreak(): Int
     suspend fun resetDismissStreak()
+
     fun resetRefreshCount()
     fun addRefresh(url: Uri, localDateTime: LocalDateTime)
     fun getAndUpdateUserRefreshesBetween(t1: LocalDateTime, t2: LocalDateTime): Int
@@ -113,11 +114,11 @@ class RealBrokenSiteReportRepository(
     override suspend fun getDismissStreakResetDays(): Int =
         brokenSitePromptDataStore.getDismissStreakResetDays()
 
-    override suspend fun setCoolDownDays(days: Int) {
+    override suspend fun setCoolDownDays(days: Long) {
         brokenSitePromptDataStore.setCoolDownDays(days)
     }
 
-    override suspend fun getCoolDownDays(): Int =
+    override suspend fun getCoolDownDays(): Long =
         brokenSitePromptDataStore.getCoolDownDays()
 
     override suspend fun setBrokenSitePromptRCSettings(
@@ -127,7 +128,7 @@ class RealBrokenSiteReportRepository(
     ) {
         setMaxDismissStreak(maxDismissStreak)
         setDismissStreakResetDays(dismissStreakResetDays)
-        setCoolDownDays(coolDownDays)
+        setCoolDownDays(coolDownDays.toLong())
     }
 
     override suspend fun resetDismissStreak() {
@@ -136,6 +137,7 @@ class RealBrokenSiteReportRepository(
 
     override suspend fun setNextShownDate(nextShownDate: LocalDate?) {
         brokenSitePromptDataStore.setNextShownDate(nextShownDate)
+        // Log.d("BrokenSitePrompt", "Next shown date set to $nextShownDate")
     }
 
     override suspend fun getDismissStreak(): Int {

broken-site/broken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/RealBrokenSitePrompt.kt

@@ -17,12 +17,13 @@
 package com.duckduckgo.brokensite.impl
 
 import android.net.Uri
+import android.util.Log
 import androidx.annotation.VisibleForTesting
+import com.duckduckgo.app.browser.DuckDuckGoUrlDetector
 import com.duckduckgo.brokensite.api.BrokenSitePrompt
 import com.duckduckgo.common.utils.CurrentTimeProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
-import java.time.LocalDate
 import javax.inject.Inject
 
 @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
@@ -36,30 +37,32 @@ class RealBrokenSitePrompt @Inject constructor(
     private val brokenSiteReportRepository: BrokenSiteReportRepository,
     private val brokenSitePromptRCFeature: BrokenSitePromptRCFeature,
     private val currentTimeProvider: CurrentTimeProvider,
+    private val duckGoUrlDetector: DuckDuckGoUrlDetector,
 ) : BrokenSitePrompt {
 
     private val _featureEnabled by lazy { brokenSitePromptRCFeature.self().isEnabled() }
 
     override suspend fun userDismissedPrompt() {
         if (!_featureEnabled) return
-        brokenSiteReportRepository.getNextShownDate()?.let {
-            if (brokenSiteReportRepository.getDismissStreak() == brokenSiteReportRepository.getMaxDismissStreak() - 1) {
-                val nextShownDate = brokenSiteReportRepository.getNextShownDate()
-                val newNextShownDate = LocalDate.now().plusDays(brokenSiteReportRepository.getCoolDownDays().toLong())
-
-                if (newNextShownDate.isAfter(nextShownDate)) {
-                    brokenSiteReportRepository.setNextShownDate(newNextShownDate)
-                }
+        Log.d("BrokenSitePrompt", "User dismissed prompt, dismiss streak: ${brokenSiteReportRepository.getDismissStreak()}")
+        if (brokenSiteReportRepository.getDismissStreak() >= brokenSiteReportRepository.getMaxDismissStreak() - 1) {
+            val nextShownDate = brokenSiteReportRepository.getNextShownDate()
+            val newNextShownDate = currentTimeProvider.localDateNow().plusDays(brokenSiteReportRepository.getDismissStreakResetDays().toLong())
+
+            Log.d("BrokenSitePrompt", "User dismissed. Next shown date: $nextShownDate, new next show date: $newNextShownDate")
+
+            if (nextShownDate == null || newNextShownDate.isAfter(nextShownDate)) {
+                brokenSiteReportRepository.setNextShownDate(newNextShownDate)
             }
         }
         brokenSiteReportRepository.incrementDismissStreak()
     }
 
     override suspend fun userAcceptedPrompt() {
         if (!_featureEnabled) return
+        Log.d("BrokenSitePrompt", "User accepted")
+
         brokenSiteReportRepository.resetDismissStreak()
-        // TODO (cbarreiro) Set next shown date based on limiting logic: https://app.asana.com/0/0/1208572901396846/f
-        brokenSiteReportRepository.setNextShownDate(null)
     }
 
     override suspend fun isFeatureEnabled(): Boolean {
@@ -83,7 +86,19 @@ class RealBrokenSitePrompt @Inject constructor(
         )
     }
 
-    override suspend fun shouldShowBrokenSitePrompt(): Boolean {
-        return isFeatureEnabled() && getUserRefreshesCount() >= REFRESH_COUNT_LIMIT
+    override suspend fun shouldShowBrokenSitePrompt(url: String): Boolean {
+        return isFeatureEnabled() &&
+            getUserRefreshesCount() >= REFRESH_COUNT_LIMIT &&
+            // && brokenSiteReportRepository.getNextShownDate()?.isBefore(currentTimeProvider.localDateNow()) ?: true
+            !duckGoUrlDetector.isDuckDuckGoUrl(url)
+    }
+
+    override suspend fun ctaShown() {
+        Log.d("BrokenSitePrompt", "CTA shown")
+        val nextShownDate = brokenSiteReportRepository.getNextShownDate()?.atStartOfDay()
+        val newNextShownDate = currentTimeProvider.localDateTimeNow().plusDays(brokenSiteReportRepository.getCoolDownDays())
+        if (nextShownDate == null || newNextShownDate.isAfter(nextShownDate)) {
+            brokenSiteReportRepository.setNextShownDate(newNextShownDate.toLocalDate())
+        }
     }
 }

broken-site/broken-site-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSitePromptTest.kt

@@ -145,7 +145,7 @@ class RealBrokenSitePromptTest {
         whenever(mockCurrentTimeProvider.localDateTimeNow()).thenReturn(LocalDateTime.now())
         whenever(mockBrokenSiteReportRepository.getAndUpdateUserRefreshesBetween(any(), any())).thenReturn(REFRESH_COUNT_LIMIT)
 
-        val result = testee.shouldShowBrokenSitePrompt()
+        val result = testee.shouldShowBrokenSitePrompt(nonNullSite.url)
 
         assertTrue(result)
     }
@@ -155,7 +155,7 @@ class RealBrokenSitePromptTest {
         whenever(mockCurrentTimeProvider.localDateTimeNow()).thenReturn(LocalDateTime.now())
         whenever(mockBrokenSiteReportRepository.getAndUpdateUserRefreshesBetween(any(), any())).thenReturn(2)
 
-        val result = testee.shouldShowBrokenSitePrompt()
+        val result = testee.shouldShowBrokenSitePrompt(nonNullSite.url)
 
         assertFalse(result)
     }
@@ -165,7 +165,7 @@ class RealBrokenSitePromptTest {
         whenever(mockCurrentTimeProvider.localDateTimeNow()).thenReturn(LocalDateTime.now())
         fakeBrokenSitePromptRCFeature.self().setRawStoredState(State(false))
 
-        val result = testee.shouldShowBrokenSitePrompt()
+        val result = testee.shouldShowBrokenSitePrompt(nonNullSite.url)
 
         assertFalse(result)
     }

broken-site/broken-site-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSiteReportRepositoryTest.kt

@@ -137,7 +137,7 @@ class RealBrokenSiteReportRepositoryTest {
 
     @Test
     fun whenCoolDownDaysCalledThenCoolDownDaysIsCalled() = runTest {
-        val days = 7
+        val days = 7L
 
         testee.setCoolDownDays(days)
 

common/common-utils/src/main/java/com/duckduckgo/common/utils/CurrentTimeProvider.kt

@@ -19,6 +19,7 @@ package com.duckduckgo.common.utils
 import android.os.SystemClock
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
+import java.time.LocalDate
 import java.time.LocalDateTime
 import javax.inject.Inject
 
@@ -28,6 +29,8 @@ interface CurrentTimeProvider {
     fun currentTimeMillis(): Long
 
     fun localDateTimeNow(): LocalDateTime
+
+    fun localDateNow(): LocalDate
 }
 
 @ContributesBinding(AppScope::class)
@@ -37,4 +40,6 @@ class RealCurrentTimeProvider @Inject constructor() : CurrentTimeProvider {
     override fun currentTimeMillis(): Long = System.currentTimeMillis()
 
     override fun localDateTimeNow(): LocalDateTime = LocalDateTime.now()
+
+    override fun localDateNow(): LocalDate = LocalDate.now()
 }