mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-27 20:09:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Better coroutine management

Browse source
This commit is contained in:
Benoit Marty 2020-05-18 15:59:15 +02:00
parent 538bda329e
commit 28f8d9500e
2 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt
View file

@ -23,9 +23,6 @@ import androidx.core.content.edit
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import im.vector.riotx.R import im.vector.riotx.R
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import timber.log.Timber import timber.log.Timber
import java.util.Locale import java.util.Locale
@ -258,19 +255,13 @@ object VectorLocale {
} }
} }
fun loadLocales(listener: Listener): Job { suspend fun getSupportedLocales(): List<Locale> {
return GlobalScope.launch(Dispatchers.Main) { if (supportedLocales.isEmpty()) {
if (supportedLocales.isEmpty()) { // init the known locales in background
// init the known locales in background withContext(Dispatchers.IO) {
withContext(Dispatchers.IO) { initApplicationLocales()
initApplicationLocales()
}
} }
listener.onLoaded(supportedLocales)
} }
} return supportedLocales
interface Listener {
fun onLoaded(locales: List<Locale>)
} }
} }

32
vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt
View file

@ -16,6 +16,7 @@
package im.vector.riotx.features.settings.locale package im.vector.riotx.features.settings.locale
import androidx.lifecycle.viewModelScope
import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.ActivityViewModelContext
import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.FragmentViewModelContext
import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.MvRxViewModelFactory
@ -26,23 +27,27 @@ import com.squareup.inject.assisted.AssistedInject
import im.vector.riotx.core.extensions.exhaustive import im.vector.riotx.core.extensions.exhaustive
import im.vector.riotx.core.platform.VectorViewModel import im.vector.riotx.core.platform.VectorViewModel
import im.vector.riotx.features.settings.VectorLocale import im.vector.riotx.features.settings.VectorLocale
import kotlinx.coroutines.Job import kotlinx.coroutines.launch
import java.util.Locale
class LocalePickerViewModel @AssistedInject constructor( class LocalePickerViewModel @AssistedInject constructor(
@Assisted initialState: LocalePickerViewState @Assisted initialState: LocalePickerViewState
) : VectorViewModel<LocalePickerViewState, LocalePickerAction, LocalePickerViewEvents>(initialState), ) : VectorViewModel<LocalePickerViewState, LocalePickerAction, LocalePickerViewEvents>(initialState) {
VectorLocale.Listener {
@AssistedInject.Factory @AssistedInject.Factory
interface Factory { interface Factory {
fun create(initialState: LocalePickerViewState): LocalePickerViewModel fun create(initialState: LocalePickerViewState): LocalePickerViewModel
} }
private var loadingJob: Job? = null
init { init {
loadingJob = VectorLocale.loadLocales(this) viewModelScope.launch {
val result = VectorLocale.getSupportedLocales()
setState {
copy(
locales = Success(result)
)
}
}
} }
companion object : MvRxViewModelFactory<LocalePickerViewModel, LocalePickerViewState> { companion object : MvRxViewModelFactory<LocalePickerViewModel, LocalePickerViewState> {
@ -67,17 +72,4 @@ class LocalePickerViewModel @AssistedInject constructor(
VectorLocale.saveApplicationLocale(action.locale) VectorLocale.saveApplicationLocale(action.locale)
_viewEvents.post(LocalePickerViewEvents.RestartActivity) _viewEvents.post(LocalePickerViewEvents.RestartActivity)
} }
override fun onLoaded(locales: List<Locale>) {
setState {
copy(
locales = Success(locales)
)
}
}
override fun onCleared() {
super.onCleared()
loadingJob?.cancel()
}
} }