Skip to content

Commit e6c46a6

Browse files
committed
Avoid blocking call to load categories in settings
1 parent 0085e22 commit e6c46a6

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import eu.kanade.presentation.more.settings.widget.TriStateListDialog
1515
import kotlinx.collections.immutable.persistentListOf
1616
import kotlinx.collections.immutable.persistentMapOf
1717
import kotlinx.collections.immutable.toImmutableMap
18-
import kotlinx.coroutines.runBlocking
1918
import tachiyomi.domain.category.interactor.GetCategories
2019
import tachiyomi.domain.category.model.Category
2120
import tachiyomi.domain.download.service.DownloadPreferences
@@ -37,7 +36,7 @@ object SettingsDownloadScreen : SearchableSettings {
3736
@Composable
3837
override fun getPreferences(): List<Preference> {
3938
val getCategories = remember { Injekt.get<GetCategories>() }
40-
val allCategories by getCategories.subscribe().collectAsState(initial = runBlocking { getCategories.await() })
39+
val allCategories by getCategories.subscribe().collectAsState(initial = emptyList())
4140

4241
val downloadPreferences = remember { Injekt.get<DownloadPreferences>() }
4342
return listOf(

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import kotlinx.collections.immutable.persistentListOf
2525
import kotlinx.collections.immutable.persistentMapOf
2626
import kotlinx.collections.immutable.toImmutableMap
2727
import kotlinx.coroutines.launch
28-
import kotlinx.coroutines.runBlocking
2928
import tachiyomi.domain.UnsortedPreferences
3029
import tachiyomi.domain.category.interactor.GetCategories
3130
import tachiyomi.domain.category.interactor.ResetCategoryFlags
@@ -59,9 +58,7 @@ object SettingsLibraryScreen : SearchableSettings {
5958
override fun getPreferences(): List<Preference> {
6059
val getCategories = remember { Injekt.get<GetCategories>() }
6160
val libraryPreferences = remember { Injekt.get<LibraryPreferences>() }
62-
val allCategories by getCategories.subscribe().collectAsState(
63-
initial = runBlocking { getCategories.await() },
64-
)
61+
val allCategories by getCategories.subscribe().collectAsState(initial = emptyList())
6562
// SY -->
6663
val unsortedPreferences = remember { Injekt.get<UnsortedPreferences>() }
6764
// SY <--

0 commit comments

Comments
 (0)