From 9efb1482f957a018427a49f5614e69e976a49ba1 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 19 Aug 2020 18:19:22 -0400 Subject: [PATCH] Updated delegation system to account for custom headers --- .../java/eu/kanade/tachiyomi/source/online/HttpSource.kt | 2 +- app/src/main/java/exh/source/DelegatedHttpSource.kt | 5 +++++ app/src/main/java/exh/source/EnhancedHttpSource.kt | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt index 230862ccd..c3d9e2128 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -91,7 +91,7 @@ abstract class HttpSource : CatalogueSource { /** * Headers used for requests. */ - val headers: Headers by lazy { headersBuilder().build() } + /* SY --> */ open /* SY <-- */ val headers: Headers by lazy { headersBuilder().build() } /** * Default network client for doing requests. diff --git a/app/src/main/java/exh/source/DelegatedHttpSource.kt b/app/src/main/java/exh/source/DelegatedHttpSource.kt index b11d7bd2b..2829ca421 100644 --- a/app/src/main/java/exh/source/DelegatedHttpSource.kt +++ b/app/src/main/java/exh/source/DelegatedHttpSource.kt @@ -99,6 +99,11 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() { */ override val baseUrl get() = delegate.baseUrl + /** + * Headers used for requests. + */ + override val headers get() = delegate.headers + /** * Whether the source has support for latest updates. */ diff --git a/app/src/main/java/exh/source/EnhancedHttpSource.kt b/app/src/main/java/exh/source/EnhancedHttpSource.kt index c95860d44..9fd2d142d 100644 --- a/app/src/main/java/exh/source/EnhancedHttpSource.kt +++ b/app/src/main/java/exh/source/EnhancedHttpSource.kt @@ -103,6 +103,11 @@ class EnhancedHttpSource( */ override val baseUrl get() = source().baseUrl + /** + * Headers used for requests. + */ + override val headers get() = source().headers + /** * Whether the source has support for latest updates. */ @@ -128,7 +133,7 @@ class EnhancedHttpSource( /** * Default network client for doing requests. */ - override val client get() = source().client + override val client get() = originalSource.client // source().client /** * Visible name of the source.