Merge branch '218-illegalstateexception-cannot-access-database-on-the-main-thread-since-it-may-potentially-lock' into 'master'

Resolve "IllegalStateException: Cannot access database on the main thread since it may potentially lock the UI for a long period ..."

Closes #218

See merge request pace/mobile/android/pace-cloud-sdk!233

Author: MelissaAtPace

CHANGELOG.md

@@ -3,9 +3,11 @@ x.y.z Release notes (yyyy-MM-dd)
 
 <!-- ### Breaking Changes - Include, if needed -->
 <!-- ### Enhancements - Include, if needed -->
-<!-- ### Fixes - Include, if needed -->
 <!-- ### Internal - Include, if needed -->
 
+### Fixes
+* Fix database access on main thread
+
 13.1.0 Release notes (2022-03-10)
 =============================================================
 

library/src/main/java/cloud/pace/sdk/poikit/POIKit.kt

@@ -32,6 +32,10 @@ import cloud.pace.sdk.poikit.utils.POIKitConfig
 import cloud.pace.sdk.utils.*
 import com.google.android.gms.maps.model.VisibleRegion
 import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.core.component.inject
 import java.util.*
 
@@ -88,21 +92,21 @@ object POIKit : CloudSDKKoinComponent, DefaultLifecycleObserver {
 
     @JvmOverloads
     fun requestGasStations(locations: Map<String, LocationPoint>, zoomLevel: Int = POIKitConfig.ZOOMLEVEL, completion: (Completion<List<GasStation>>) -> Unit) {
-        onBackgroundThread {
-            val tileRequest = locations.values.toTileQueryRequest(zoomLevel)
+        val tileRequest = locations.values.toTileQueryRequest(zoomLevel)
 
-            tileDownloader.load(tileRequest) {
-                it.onSuccess { stations ->
+        tileDownloader.load(tileRequest) {
+            it.onSuccess { stations ->
+                CoroutineScope(Dispatchers.IO).launch {
                     database.gasStationDao().insertGasStations(stations)
-                    onMainThread {
+                    withContext(Dispatchers.Main) {
                         completion(Success(stations))
                     }
                 }
+            }
 
-                it.onFailure { error ->
-                    onMainThread {
-                        completion(Failure(error))
-                    }
+            it.onFailure { error ->
+                onMainThread {
+                    completion(Failure(error))
                 }
             }
         }

library/src/main/java/cloud/pace/sdk/poikit/poi/PoiKitObserverToken.kt

@@ -14,9 +14,7 @@ import cloud.pace.sdk.poikit.utils.addPadding
 import cloud.pace.sdk.poikit.utils.toTileQueryRequest
 import cloud.pace.sdk.utils.*
 import com.google.android.gms.maps.model.VisibleRegion
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import okhttp3.Call
 import org.koin.core.component.inject
 import java.util.*
@@ -72,19 +70,21 @@ class VisibleRegionNotificationToken(
 
         downloadTask = tileDownloader.load(tileRequest) {
             it.onSuccess { stations ->
-                gasStationDao.insertGasStations(stations)
-
-                MainScope().launch { loading.value = false }
+                CoroutineScope(Dispatchers.IO).launch {
+                    gasStationDao.insertGasStations(stations)
 
-                // Delete gas stations not reported by new tiles anymore
-                val persistedGasStations = gasStationDao.getInBoundingBox(
-                    minLat = visibleRegion.latLngBounds.southwest.latitude,
-                    minLon = visibleRegion.latLngBounds.southwest.longitude,
-                    maxLat = visibleRegion.latLngBounds.northeast.latitude,
-                    maxLon = visibleRegion.latLngBounds.northeast.longitude
-                )
-                val outdatedStations = persistedGasStations.filter { it.id !in stations.map { it.id } }
-                gasStationDao.delete(outdatedStations)
+                    withContext(Dispatchers.Main) { loading.value = false }
+
+                    // Delete gas stations not reported by new tiles anymore
+                    val persistedGasStations = gasStationDao.getInBoundingBox(
+                        minLat = visibleRegion.latLngBounds.southwest.latitude,
+                        minLon = visibleRegion.latLngBounds.southwest.longitude,
+                        maxLat = visibleRegion.latLngBounds.northeast.latitude,
+                        maxLon = visibleRegion.latLngBounds.northeast.longitude
+                    )
+                    val outdatedStations = persistedGasStations.filter { it.id !in stations.map { it.id } }
+                    gasStationDao.delete(outdatedStations)
+                }
             }
 
             it.onFailure { error ->
@@ -119,13 +119,15 @@ class IDsNotificationToken(
     override fun refresh(zoomLevel: Int) {
         loading.value = true
 
-        GlobalScope.launch {
+        CoroutineScope(Dispatchers.IO).launch {
             val tileRequest = gasStationDao.getByIds(ids).mapNotNull { it.center }.toTileQueryRequest(zoomLevel)
 
             downloadTask = tileDownloader.load(tileRequest) {
                 it.onSuccess { stations ->
-                    gasStationDao.insertGasStations(stations)
-                    MainScope().launch { loading.value = false }
+                    CoroutineScope(Dispatchers.IO).launch {
+                        gasStationDao.insertGasStations(stations)
+                        withContext(Dispatchers.Main) { loading.value = false }
+                    }
                 }
 
                 it.onFailure { error ->
@@ -200,8 +202,10 @@ class IDNotificationToken(
     private fun download(location: LocationPoint, zoomLevel: Int) {
         downloadTask = tileDownloader.load(location.toTileQueryRequest(zoomLevel)) {
             it.onSuccess { stations ->
-                gasStationDao.insertGasStations(stations)
-                MainScope().launch { loading.value = false }
+                CoroutineScope(Dispatchers.IO).launch {
+                    gasStationDao.insertGasStations(stations)
+                    withContext(Dispatchers.Main) { loading.value = false }
+                }
             }
 
             it.onFailure { error ->
@@ -229,19 +233,18 @@ class LocationsNotificationToken(
     override fun refresh(zoomLevel: Int) {
         loading.value = true
 
-        GlobalScope.launch {
-            val tileRequest = locations.values.toTileQueryRequest(zoomLevel)
-
-            downloadTask = tileDownloader.load(tileRequest) {
-                it.onSuccess { stations ->
+        val tileRequest = locations.values.toTileQueryRequest(zoomLevel)
+        downloadTask = tileDownloader.load(tileRequest) {
+            it.onSuccess { stations ->
+                CoroutineScope(Dispatchers.IO).launch {
                     gasStationDao.insertGasStations(stations)
-                    MainScope().launch { loading.value = false }
+                    withContext(Dispatchers.Main) { loading.value = false }
                 }
+            }
 
-                it.onFailure { error ->
-                    completion(Failure(error))
-                    MainScope().launch { loading.value = false }
-                }
+            it.onFailure { error ->
+                completion(Failure(error))
+                MainScope().launch { loading.value = false }
             }
         }