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

Fix a typo that likely goes back all the way to EH

Browse Source
This commit is contained in:
Jobobby04 2020-06-26 23:19:09 -04:00
parent 4b57e33f2d
commit bf209896ed
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ open class SourceManager(private val context: Context) {
} }
fun getDelegatedCatalogueSources() = sourcesMap.values.filterIsInstance<EnhancedHttpSource>().mapNotNull { enhancedHttpSource -> fun getDelegatedCatalogueSources() = sourcesMap.values.filterIsInstance<EnhancedHttpSource>().mapNotNull { enhancedHttpSource ->
enhancedHttpSource.enchancedSource as? DelegatedHttpSource enhancedHttpSource.enhancedSource as? DelegatedHttpSource
} }
// SY <-- // SY <--
@ -101,7 +101,7 @@ open class SourceManager(private val context: Context) {
source, source,
delegate.newSourceClass.constructors.find { it.parameters.size == 1 }!!.call(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) currentDelegatedSources.plusAssign(map)
enhancedSource enhancedSource
} else source } else source

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt
View File

@ -80,7 +80,7 @@ class SourcePreferencesController(bundle: Bundle? = null) :
try { try {
// SY --> // SY -->
if (source is EnhancedHttpSource) { if (source is EnhancedHttpSource) {
if (source.enchancedSource is ConfigurableSource) { if (source.enhancedSource is ConfigurableSource) {
addPreferencesForSource(screen, source.source()) addPreferencesForSource(screen, source.source())
} else { } else {
addPreferencesForSource(screen, source.originalSource) addPreferencesForSource(screen, source.originalSource)

6
app/src/main/java/exh/source/EnhancedHttpSource.kt
View File

@ -12,7 +12,7 @@ import uy.kohesive.injekt.injectLazy
class EnhancedHttpSource( class EnhancedHttpSource(
val originalSource: HttpSource, val originalSource: HttpSource,
val enchancedSource: HttpSource val enhancedSource: HttpSource
) : HttpSource() { ) : HttpSource() {
private val prefs: PreferencesHelper by injectLazy() private val prefs: PreferencesHelper by injectLazy()
@ -215,9 +215,9 @@ class EnhancedHttpSource(
*/ */
override fun getFilterList() = source().getFilterList() override fun getFilterList() = source().getFilterList()
private fun source(): HttpSource { fun source(): HttpSource {
return if (prefs.eh_delegateSources().get()) { return if (prefs.eh_delegateSources().get()) {
enchancedSource enhancedSource
} else { } else {
originalSource originalSource
} }