From f61c456caaacaed31ccad9f43151262e553f2d48 Mon Sep 17 00:00:00 2001 From: Eric Ampire Date: Mon, 6 Sep 2021 21:54:09 +0200 Subject: [PATCH] All methods that return Flow must not be suspendable --- .../datasource/lottiefiles/LocalLottieFileDataSource.kt | 6 +++--- .../data/datasource/lottiefiles/LottieFileDataSource.kt | 6 +++--- .../datasource/lottiefiles/RemoteLottieFileDataSource.kt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LocalLottieFileDataSource.kt b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LocalLottieFileDataSource.kt index 569082f..8df0b6d 100644 --- a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LocalLottieFileDataSource.kt +++ b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LocalLottieFileDataSource.kt @@ -10,19 +10,19 @@ import javax.inject.Inject class LocalLottieFileDataSource @Inject constructor( private val lottieFileDao: LottieFilesDao ) : LottieFileDataSource { - override suspend fun findRecent(): Flow>> { + override fun findRecent(): Flow>> { return lottieFileDao.findRecent().map { Result.Success(it) } } - override suspend fun findPopular(): Flow>> { + override fun findPopular(): Flow>> { return lottieFileDao.findPopular().map { Result.Success(it) } } - override suspend fun findFeatured(): Flow>> { + override fun findFeatured(): Flow>> { return lottieFileDao.findFeatured().map { Result.Success(it) } diff --git a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LottieFileDataSource.kt b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LottieFileDataSource.kt index 86c695e..2d38663 100644 --- a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LottieFileDataSource.kt +++ b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/LottieFileDataSource.kt @@ -5,8 +5,8 @@ import com.ericampire.android.androidstudycase.util.Result import kotlinx.coroutines.flow.Flow interface LottieFileDataSource { - suspend fun findRecent(): Flow>> - suspend fun findPopular(): Flow>> - suspend fun findFeatured(): Flow>> + fun findRecent(): Flow>> + fun findPopular(): Flow>> + fun findFeatured(): Flow>> suspend fun save(lottiefile: Lottiefile) } \ No newline at end of file diff --git a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/RemoteLottieFileDataSource.kt b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/RemoteLottieFileDataSource.kt index a31f20c..94ac6af 100644 --- a/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/RemoteLottieFileDataSource.kt +++ b/data/src/main/java/com/ericampire/android/androidstudycase/data/datasource/lottiefiles/RemoteLottieFileDataSource.kt @@ -14,7 +14,7 @@ class RemoteLottieFileDataSource @Inject constructor( private val httpClient: HttpClient ) : LottieFileDataSource { - private suspend fun find(url: String): Flow>> { + private fun find(url: String): Flow>> { return flow { try { val data = httpClient.get(url) @@ -25,15 +25,15 @@ class RemoteLottieFileDataSource @Inject constructor( } } - override suspend fun findRecent(): Flow>> { + override fun findRecent(): Flow>> { return find(ApiUrl.LottieFile.recent) } - override suspend fun findPopular(): Flow>> { + override fun findPopular(): Flow>> { return find(ApiUrl.LottieFile.popular) } - override suspend fun findFeatured(): Flow>> { + override fun findFeatured(): Flow>> { return find(ApiUrl.LottieFile.featured) }