Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid concurrency crashes in SourceManager

Browse Source 
(cherry picked from commit d0c4463ab372460ce6f16ec09ea975448423ed66)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
This commit is contained in:
arkon 2022-10-28 21:29:38 -04:00 committed by Jobobby04
parent ef1242d067
commit 94c0b0a36e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
View File

@ -44,6 +44,7 @@ import kotlinx.coroutines.runBlocking
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import kotlin.reflect.KClass import kotlin.reflect.KClass
import java.util.concurrent.ConcurrentHashMap
class SourceManager( class SourceManager(
private val context: Context, private val context: Context,
@ -54,7 +55,7 @@ class SourceManager(
private val scope = CoroutineScope(Job() + Dispatchers.IO) private val scope = CoroutineScope(Job() + Dispatchers.IO)
private var sourcesMap = emptyMap<Long, Source>() private var sourcesMap = ConcurrentHashMap<Long, Source>()
set(value) { set(value) {
field = value field = value
sourcesMapFlow.value = field sourcesMapFlow.value = field
@ -62,7 +63,7 @@ class SourceManager(
private val sourcesMapFlow = MutableStateFlow(sourcesMap) private val sourcesMapFlow = MutableStateFlow(sourcesMap)
private val stubSourcesMap = mutableMapOf<Long, StubSource>() private val stubSourcesMap = ConcurrentHashMap<Long, StubSource>()
val catalogueSources: Flow<List<CatalogueSource>> = sourcesMapFlow.map { it.values.filterIsInstance<CatalogueSource>() } val catalogueSources: Flow<List<CatalogueSource>> = sourcesMapFlow.map { it.values.filterIsInstance<CatalogueSource>() }
val onlineSources: Flow<List<HttpSource>> = catalogueSources.map { sources -> sources.filterIsInstance<HttpSource>() } val onlineSources: Flow<List<HttpSource>> = catalogueSources.map { sources -> sources.filterIsInstance<HttpSource>() }
@ -80,7 +81,7 @@ class SourceManager(
} }
// SY <-- // SY <--
.collectLatest { (extensions, enableExhentai) -> .collectLatest { (extensions, enableExhentai) ->
val mutableMap = mutableMapOf<Long, Source>(LocalSource.ID to LocalSource(context)).apply { val mutableMap = ConcurrentHashMap<Long, Source>(mapOf(LocalSource.ID to LocalSource(context))).apply {
// SY --> // SY -->
put(EH_SOURCE_ID, EHentai(EH_SOURCE_ID, false, context)) put(EH_SOURCE_ID, EHentai(EH_SOURCE_ID, false, context))
if (enableExhentai) { if (enableExhentai) {