Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #616 from ultrasonic/rm-globalscope 

Remove global scope use
This commit is contained in:
Nite 2021-11-02 21:32:21 +01:00 committed by GitHub
parent 7ed91db250 e32b3461c9
commit a34fc809d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt
View File

@ -2,8 +2,8 @@ package org.moire.ultrasonic.data
import androidx.lifecycle.MutableLiveData
import androidx.room.Room
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
@ -24,7 +24,7 @@ import timber.log.Timber
*/
class ActiveServerProvider(
private val repository: ServerSettingDao
) {
) : CoroutineScope by CoroutineScope(Dispatchers.IO) {
private var cachedServer: ServerSetting? = null
private var cachedDatabase: MetaDatabase? = null
private var cachedServerId: Int? = null
@ -83,7 +83,7 @@ class ActiveServerProvider(
return
}
GlobalScope.launch(Dispatchers.IO) {
launch {
val serverId = repository.findByIndex(index)?.id ?: 0
setActiveServerId(serverId)
}
@ -133,7 +133,7 @@ class ActiveServerProvider(
* Sets the minimum Subsonic API version of the current server.
*/
fun setMinimumApiVersion(apiVersion: String) {
GlobalScope.launch(Dispatchers.IO) {
launch {
if (cachedServer != null) {
cachedServer!!.minimumApiVersion = apiVersion
repository.update(cachedServer!!)