Migrate from StateFlow to Flow

duckduckgo · Nov 7, 2024 · 2162998 · 2162998
1 parent e415dbb
commit 2162998
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/...broken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSitePomptDataStore.kt b/...broken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSitePomptDataStore.kt
@@ -36,12 +36,9 @@ import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 
 interface BrokenSitePomptDataStore {
     suspend fun setMaxDismissStreak(maxDismissStreak: Int)
@@ -53,9 +50,9 @@ interface BrokenSitePomptDataStore {
     suspend fun setCoolDownDays(days: Int)
     suspend fun getCoolDownDays(): Int
     suspend fun setDismissStreak(streak: Int)
-    fun getDismissStreak(): Int
+    suspend fun getDismissStreak(): Int
     suspend fun setNextShownDate(nextShownDate: LocalDate?)
-    fun getNextShownDate(): LocalDate?
+    suspend fun getNextShownDate(): LocalDate?
 }
 
 @ContributesBinding(AppScope::class)
@@ -93,19 +90,17 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
         }
         .distinctUntilChanged()
 
-    private val dismissStreak: StateFlow<Int> = store.data
+    private val dismissStreak: Flow<Int> = store.data
         .map { prefs ->
             prefs[DISMISS_STREAK] ?: 7
         }
         .distinctUntilChanged()
-        .stateIn(appCoroutineScope, SharingStarted.Eagerly, 0)
 
-    private val nextShownDate: StateFlow<String?> = store.data
+    private val nextShownDate: Flow<String?> = store.data
         .map { prefs ->
             prefs[NEXT_SHOWN_DATE]
         }
         .distinctUntilChanged()
-        .stateIn(appCoroutineScope, SharingStarted.Eagerly, null)
 
     override suspend fun setMaxDismissStreak(maxDismissStreak: Int) {
         store.edit { prefs -> prefs[MAX_DISMISS_STREAK] = maxDismissStreak }
@@ -140,11 +135,11 @@ class SharedPreferencesDuckPlayerDataStore @Inject constructor(
         }
     }
 
-    override fun getDismissStreak(): Int {
-        return dismissStreak.value
+    override suspend fun getDismissStreak(): Int {
+        return dismissStreak.first()
     }
 
-    override fun getNextShownDate(): LocalDate? {
-        return nextShownDate.value?.let { LocalDate.parse(it, formatter) }
+    override suspend fun getNextShownDate(): LocalDate? {
+        return nextShownDate.first()?.let { LocalDate.parse(it, formatter) }
     }
 }
diff --git a/...oken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSiteReportRepository.kt b/...oken-site-impl/src/main/java/com/duckduckgo/brokensite/impl/BrokenSiteReportRepository.kt
@@ -50,10 +50,10 @@ interface BrokenSiteReportRepository {
     suspend fun setBrokenSitePromptRCSettings(maxDismissStreak: Int, dismissStreakResetDays: Int, coolDownDays: Int)
 
     suspend fun setNextShownDate(nextShownDate: LocalDate?)
-    fun getNextShownDate(): LocalDate?
+    suspend fun getNextShownDate(): LocalDate?
 
     suspend fun incrementDismissStreak()
-    fun getDismissStreak(): Int
+    suspend fun getDismissStreak(): Int
     suspend fun resetDismissStreak()
 }
 
@@ -133,11 +133,11 @@ class RealBrokenSiteReportRepository(
         brokenSitePromptDataStore.setNextShownDate(nextShownDate)
     }
 
-    override fun getDismissStreak(): Int {
+    override suspend fun getDismissStreak(): Int {
         return brokenSitePromptDataStore.getDismissStreak()
     }
 
-    override fun getNextShownDate(): LocalDate? {
+    override suspend fun getNextShownDate(): LocalDate? {
         return brokenSitePromptDataStore.getNextShownDate()
     }
 

diff --git a/...broken-site-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSitePromptTest.kt b/...broken-site-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSitePromptTest.kt
@@ -25,7 +25,7 @@ class RealBrokenSitePromptTest {
     )
 
     @Before
-    fun setup() {
+    fun setup() = runTest {
         whenever(mockBrokenSiteReportRepository.getCoolDownDays()).thenReturn(7)
         whenever(mockBrokenSiteReportRepository.getMaxDismissStreak()).thenReturn(3)
         fakeBrokenSitePromptRCFeature.self().setRawStoredState(State(true))

diff --git a/...e-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSiteReportRepositoryTest.kt b/...e-impl/src/test/java/com/duckduckgo/brokensite/impl/RealBrokenSiteReportRepositoryTest.kt
@@ -157,7 +157,7 @@ class RealBrokenSiteReportRepositoryTest {
     }
 
     @Test
-    fun whenGetDismissStreakCalledThenReturnDismissStreak() {
+    fun whenGetDismissStreakCalledThenReturnDismissStreak() = runTest {
         val dismissStreak = 5
         whenever(mockDataStore.getDismissStreak()).thenReturn(dismissStreak)
 
@@ -167,7 +167,7 @@ class RealBrokenSiteReportRepositoryTest {
     }
 
     @Test
-    fun whenGetNextShownDateCalledThenReturnNextShownDate() {
+    fun whenGetNextShownDateCalledThenReturnNextShownDate() = runTest {
         val nextShownDate = LocalDate.now()
         whenever(mockDataStore.getNextShownDate()).thenReturn(nextShownDate)