Merge "Use a SupervisorJob in BubbleDataRepository" into udc-qpr-dev

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.Job

import kotlinx.coroutines.SupervisorJob

import kotlinx.coroutines.cancelAndJoin

import kotlinx.coroutines.launch

import kotlinx.coroutines.yield

    private val volatileRepository = BubbleVolatileRepository(launcherApps)

    private val persistentRepository = BubblePersistentRepository(context)

    private val ioScope = CoroutineScope(Dispatchers.IO)

    private val coroutineScope = CoroutineScope(Dispatchers.IO + SupervisorJob())

    private var job: Job? = null

    // For use in Bubble construction.

     */

    private fun persistToDisk() {

        val prev = job

        job = ioScope.launch {

        job = coroutineScope.launch {

            // if there was an ongoing disk I/O operation, they can be cancelled

            prev?.cancelAndJoin()

            // check for cancellation before disk I/O

     *           bubbles.

     */

    @SuppressLint("WrongConstant")

    fun loadBubbles(userId: Int, cb: (List<Bubble>) -> Unit) = ioScope.launch {

    fun loadBubbles(userId: Int, cb: (List<Bubble>) -> Unit) = coroutineScope.launch {

        /**

         * Load BubbleEntity from disk.

         * e.g.