Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

don't specify executor when mapping/filtering pagingData

This commit is contained in:
Conny Duck 2024-05-03 15:21:21 +02:00
parent 3581e9a933
commit b3a897831d
No known key found for this signature in database
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
View File

@ -55,7 +55,6 @@ import javax.inject.Inject
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.async
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@ -103,10 +102,10 @@ class NotificationsViewModel @Inject constructor(
).flow
.cachedIn(viewModelScope)
.combine(translations) { pagingData, translations ->
pagingData.map(Dispatchers.Default.asExecutor()) { notification ->
pagingData.map { notification ->
val translation = translations[notification.status?.serverId]
notification.toViewData(translation = translation)
}.filter(Dispatchers.Default.asExecutor()) { notificationViewData ->
}.filter { notificationViewData ->
shouldFilterStatus(notificationViewData) != Filter.Action.HIDE
}
}

5
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt
View File

@ -50,7 +50,6 @@ import com.keylesspalace.tusky.viewdata.StatusViewData
import com.keylesspalace.tusky.viewdata.TranslationViewData
import javax.inject.Inject
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flowOn
@ -103,13 +102,13 @@ class CachedTimelineViewModel @Inject constructor(
// adding another cachedIn() for the overall result.
.cachedIn(viewModelScope)
.combine(translations) { pagingData, translations ->
pagingData.map(Dispatchers.Default.asExecutor()) { timelineData ->
pagingData.map { timelineData ->
val translation = translations[timelineData.status?.serverId]
timelineData.toViewData(
isDetailed = false,
translation = translation
)
}.filter(Dispatchers.Default.asExecutor()) { statusViewData ->
}.filter { statusViewData ->
shouldFilterStatus(statusViewData) != Filter.Action.HIDE
}
}