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 e623be0ff..230862ccd 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 @@ -37,24 +37,24 @@ abstract class HttpSource : CatalogueSource { */ // SY --> protected val network: NetworkHelper by lazy { - val original = Injekt.get() + val network = Injekt.get() object : NetworkHelper(Injekt.get()) { override val client: OkHttpClient - get() = delegate?.networkHttpClient ?: original.client + get() = delegate?.networkHttpClient ?: network.client .newBuilder() .injectPatches { id } .maybeInjectEHLogger() .build() override val cloudflareClient: OkHttpClient - get() = delegate?.networkCloudflareClient ?: original.cloudflareClient + get() = delegate?.networkCloudflareClient ?: network.cloudflareClient .newBuilder() .injectPatches { id } .maybeInjectEHLogger() .build() override val cookieManager: AndroidCookieJar - get() = original.cookieManager + get() = network.cookieManager } } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 5c6659f83..74326ab8d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -52,6 +52,8 @@ import exh.util.ignore import exh.util.nullIfBlank import exh.util.trimOrNull import exh.util.urlImportFetchSearchManga +import java.net.URLEncoder +import java.util.ArrayList import kotlinx.coroutines.runBlocking import okhttp3.CacheControl import okhttp3.CookieJar @@ -67,8 +69,6 @@ import org.jsoup.nodes.TextNode import rx.Observable import rx.Single import uy.kohesive.injekt.injectLazy -import java.net.URLEncoder -import java.util.ArrayList // TODO Consider gallery updating when doing tabbed browsing @Nsfw diff --git a/app/src/main/res/drawable/eh_ic_hllogo.xml b/app/src/main/res/drawable/eh_ic_hllogo.xml deleted file mode 100644 index 840be3bc3..000000000 --- a/app/src/main/res/drawable/eh_ic_hllogo.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/eh_ic_nhlogo_color.xml b/app/src/main/res/drawable/eh_ic_nhlogo_color.xml deleted file mode 100644 index 85942d927..000000000 --- a/app/src/main/res/drawable/eh_ic_nhlogo_color.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - -