Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 16:41:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove source overwrite logic since built-in sources no longer exist

Browse Source
This commit is contained in:
arkon 2020-12-12 16:15:18 -05:00
parent 836aec4396
commit 1a439ecece
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt
View File

@ -124,8 +124,7 @@ class ExtensionManager(
.map { it.extension } .map { it.extension }
installedExtensions installedExtensions
.flatMap { it.sources } .flatMap { it.sources }
// overwrite is needed until the bundled sources are removed .forEach { sourceManager.registerSource(it) }
.forEach { sourceManager.registerSource(it, true) }
untrustedExtensions = extensions untrustedExtensions = extensions
.filterIsInstance<LoadResult.Untrusted>() .filterIsInstance<LoadResult.Untrusted>()

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

@ -32,11 +32,11 @@ open class SourceManager(private val context: Context) {
fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>() fun getCatalogueSources() = sourcesMap.values.filterIsInstance<CatalogueSource>()
internal fun registerSource(source: Source, overwrite: Boolean = false) { internal fun registerSource(source: Source) {
if (overwrite || !sourcesMap.containsKey(source.id)) { if (!sourcesMap.containsKey(source.id)) {
sourcesMap[source.id] = source sourcesMap[source.id] = source
} }
if (overwrite || !stubSourcesMap.containsKey(source.id)) { if (!stubSourcesMap.containsKey(source.id)) {
stubSourcesMap[source.id] = StubSource(source.id) stubSourcesMap[source.id] = StubSource(source.id)
} }
} }