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 a14e91f46..e296fd415 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -81,7 +81,7 @@ open class SourceManager(private val context: Context) { } fun getDelegatedCatalogueSources() = sourcesMap.values.filterIsInstance().mapNotNull { enhancedHttpSource -> - enhancedHttpSource.enchancedSource as? DelegatedHttpSource + enhancedHttpSource.enhancedSource as? DelegatedHttpSource } // SY <-- @@ -101,7 +101,7 @@ open class SourceManager(private val context: Context) { source, delegate.newSourceClass.constructors.find { it.parameters.size == 1 }!!.call(source) ) - val map = listOf(DelegatedSource(enhancedSource.originalSource.name, enhancedSource.originalSource.id, enhancedSource.originalSource::class.qualifiedName ?: delegate.originalSourceQualifiedClassName, (enhancedSource.enchancedSource as DelegatedHttpSource)::class, delegate.factory)).associateBy { it.originalSourceQualifiedClassName } + val map = listOf(DelegatedSource(enhancedSource.originalSource.name, enhancedSource.originalSource.id, enhancedSource.originalSource::class.qualifiedName ?: delegate.originalSourceQualifiedClassName, (enhancedSource.enhancedSource as DelegatedHttpSource)::class, delegate.factory)).associateBy { it.originalSourceQualifiedClassName } currentDelegatedSources.plusAssign(map) enhancedSource } else source diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt index cd41e6011..95950b056 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt @@ -80,7 +80,7 @@ class SourcePreferencesController(bundle: Bundle? = null) : try { // SY --> if (source is EnhancedHttpSource) { - if (source.enchancedSource is ConfigurableSource) { + if (source.enhancedSource is ConfigurableSource) { addPreferencesForSource(screen, source.source()) } else { addPreferencesForSource(screen, source.originalSource) diff --git a/app/src/main/java/exh/source/EnhancedHttpSource.kt b/app/src/main/java/exh/source/EnhancedHttpSource.kt index 3804a0dcc..03c846a32 100644 --- a/app/src/main/java/exh/source/EnhancedHttpSource.kt +++ b/app/src/main/java/exh/source/EnhancedHttpSource.kt @@ -12,7 +12,7 @@ import uy.kohesive.injekt.injectLazy class EnhancedHttpSource( val originalSource: HttpSource, - val enchancedSource: HttpSource + val enhancedSource: HttpSource ) : HttpSource() { private val prefs: PreferencesHelper by injectLazy() @@ -215,9 +215,9 @@ class EnhancedHttpSource( */ override fun getFilterList() = source().getFilterList() - private fun source(): HttpSource { + fun source(): HttpSource { return if (prefs.eh_delegateSources().get()) { - enchancedSource + enhancedSource } else { originalSource }