From bbd3e3c29cd099b031ec1705496ea2902748efe9 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 12 Dec 2020 16:15:18 -0500 Subject: [PATCH] Remove source overwrite logic since built-in sources no longer exist (cherry picked from commit 1a439ecece5e2963a5e6ba9761adad90f8c0bb29) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt --- .../java/eu/kanade/tachiyomi/extension/ExtensionManager.kt | 3 +-- app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt index 72b0a2720..df7fb186e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/ExtensionManager.kt @@ -142,8 +142,7 @@ class ExtensionManager( .map { it.extension } installedExtensions .flatMap { it.sources } - // overwrite is needed until the bundled sources are removed - .forEach { sourceManager.registerSource(it, true) } + .forEach { sourceManager.registerSource(it) } untrustedExtensions = extensions .filterIsInstance() 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 8e56ec3d7..5e5bf163a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -103,7 +103,7 @@ open class SourceManager(private val context: Context) { } // SY <-- - internal fun registerSource(source: Source, overwrite: Boolean = false) { + internal fun registerSource(source: Source) { // EXH --> val sourceQName = source::class.qualifiedName val factories = DELEGATED_SOURCES.entries.filter { it.value.factory }.map { it.value.originalSourceQualifiedClassName } @@ -130,7 +130,7 @@ open class SourceManager(private val context: Context) { } // EXH <-- - if (overwrite || !sourcesMap.containsKey(source.id)) { + if (!sourcesMap.containsKey(source.id)) { sourcesMap[source.id] = newSource } }