From 94c0b0a36e204a2852594eaf9b3d978ab69ff3e2 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 28 Oct 2022 21:29:38 -0400 Subject: [PATCH] Avoid concurrency crashes in SourceManager (cherry picked from commit d0c4463ab372460ce6f16ec09ea975448423ed66) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt --- .../main/java/eu/kanade/tachiyomi/source/SourceManager.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index 1186a46d7..07b0bccf8 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -44,6 +44,7 @@ import kotlinx.coroutines.runBlocking import rx.Observable import uy.kohesive.injekt.injectLazy import kotlin.reflect.KClass +import java.util.concurrent.ConcurrentHashMap class SourceManager( private val context: Context, @@ -54,7 +55,7 @@ class SourceManager( private val scope = CoroutineScope(Job() + Dispatchers.IO) - private var sourcesMap = emptyMap() + private var sourcesMap = ConcurrentHashMap() set(value) { field = value sourcesMapFlow.value = field @@ -62,7 +63,7 @@ class SourceManager( private val sourcesMapFlow = MutableStateFlow(sourcesMap) - private val stubSourcesMap = mutableMapOf() + private val stubSourcesMap = ConcurrentHashMap() val catalogueSources: Flow> = sourcesMapFlow.map { it.values.filterIsInstance() } val onlineSources: Flow> = catalogueSources.map { sources -> sources.filterIsInstance() } @@ -80,7 +81,7 @@ class SourceManager( } // SY <-- .collectLatest { (extensions, enableExhentai) -> - val mutableMap = mutableMapOf(LocalSource.ID to LocalSource(context)).apply { + val mutableMap = ConcurrentHashMap(mapOf(LocalSource.ID to LocalSource(context))).apply { // SY --> put(EH_SOURCE_ID, EHentai(EH_SOURCE_ID, false, context)) if (enableExhentai) {