Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run DAO operation on Dispatchers.IO (end) #433

Merged
merged 4 commits into from
Apr 4, 2024
Merged

Run DAO operation on Dispatchers.IO (end) #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25573aa
Run DAO operation on Dispatchers.IO.
arriolac Apr 3, 2024
ef5f9bb
Use withContext() to set dispatcher.
arriolac Apr 3, 2024
ea6e98b
Remove import.
arriolac Apr 3, 2024
5979a36
Fix test.
arriolac Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...androidTest/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import com.google.samples.apps.sunflower.data.GardenPlantingRepository
import com.google.samples.apps.sunflower.data.PlantRepository
import com.google.samples.apps.sunflower.utilities.getValue
import com.google.samples.apps.sunflower.utilities.testPlant
import kotlinx.coroutines.Dispatchers
import org.junit.After
import org.junit.Assert.assertFalse
import org.junit.Before
Expand All @@ -45,7 +46,8 @@ class PlantDetailViewModelTest {

val plantRepo = PlantRepository.getInstance(appDatabase.plantDao())
val gardenPlantingRepo = GardenPlantingRepository.getInstance(
appDatabase.gardenPlantingDao()
appDatabase.gardenPlantingDao(),
Dispatchers.IO
)
viewModel = PlantDetailViewModel(plantRepo, gardenPlantingRepo, testPlant.plantId)
}
Expand Down
19 changes: 14 additions & 5 deletions ...elab/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,20 @@

package com.google.samples.apps.sunflower.data

import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext

class GardenPlantingRepository private constructor(
private val gardenPlantingDao: GardenPlantingDao
private val gardenPlantingDao: GardenPlantingDao,
private val ioDispatcher: CoroutineDispatcher
) {

suspend fun createGardenPlanting(plantId: String) {
val gardenPlanting = GardenPlanting(plantId)
gardenPlantingDao.insertGardenPlanting(gardenPlanting)
withContext(ioDispatcher) {
val gardenPlanting = GardenPlanting(plantId)
gardenPlantingDao.insertGardenPlanting(gardenPlanting)
}
}

suspend fun removeGardenPlanting(gardenPlanting: GardenPlanting) {
Expand All @@ -39,9 +46,11 @@ class GardenPlantingRepository private constructor(
// For Singleton instantiation
@Volatile private var instance: GardenPlantingRepository? = null

fun getInstance(gardenPlantingDao: GardenPlantingDao) =
fun getInstance(gardenPlantingDao: GardenPlantingDao, ioDispatcher: CoroutineDispatcher) =
instance ?: synchronized(this) {
instance ?: GardenPlantingRepository(gardenPlantingDao).also { instance = it }
instance ?: GardenPlantingRepository(gardenPlantingDao, ioDispatcher).also {
instance = it
}
}
}
}
6 changes: 5 additions & 1 deletion ...ionCodelab/app/src/main/java/com/google/samples/apps/sunflower/utilities/InjectorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ import com.google.samples.apps.sunflower.data.PlantRepository
import com.google.samples.apps.sunflower.viewmodels.GardenPlantingListViewModelFactory
import com.google.samples.apps.sunflower.viewmodels.PlantDetailViewModelFactory
import com.google.samples.apps.sunflower.viewmodels.PlantListViewModelFactory
import kotlinx.coroutines.Dispatchers

/**
* Static methods used to inject classes needed for various Activities and Fragments.
*/
object InjectorUtils {

private val ioDispatcher = Dispatchers.IO

private fun getPlantRepository(context: Context): PlantRepository {
return PlantRepository.getInstance(
AppDatabase.getInstance(context.applicationContext).plantDao()
Expand All @@ -38,7 +41,8 @@ object InjectorUtils {

private fun getGardenPlantingRepository(context: Context): GardenPlantingRepository {
return GardenPlantingRepository.getInstance(
AppDatabase.getInstance(context.applicationContext).gardenPlantingDao()
AppDatabase.getInstance(context.applicationContext).gardenPlantingDao(),
ioDispatcher
)
}

Expand Down