mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-20 16:01:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to accuracy of universal captcha detection

Browse Source
This commit is contained in:
NerdNumber9
2019-04-21 23:01:41 -04:00
parent 59fcfbe9d2
commit c5ab79f618
5 changed files with 122 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
View File

@@ -3,10 +3,6 @@ package eu.kanade.tachiyomi.network
import android.content.Context
import android.os.Build
import exh.log.maybeInjectEHLogger
import exh.patch.MANGADEX_DOMAIN
import exh.patch.MANGADEX_SOURCE_ID
import exh.patch.attachMangaDexLogin
import exh.patch.detectCaptchas
import okhttp3.*
import java.io.File
import java.io.IOException
@@ -35,8 +31,7 @@ open class NetworkHelper(context: Context) {
open val cloudflareClient = client.newBuilder()
.addInterceptor(CloudflareInterceptor(context))
.attachMangaDexLogin()
.detectCaptchas(context, MANGADEX_SOURCE_ID, listOf(MANGADEX_DOMAIN))
.maybeInjectEHLogger()
.build()
private fun OkHttpClient.Builder.enableTLS12(): OkHttpClient.Builder {

12
app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
View File

@@ -6,13 +6,12 @@ import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.network.*
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.model.*
import exh.patch.detectCaptchas
import exh.patch.injectPatches
import exh.source.DelegatedHttpSource
import okhttp3.*
import rx.Observable
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.lang.Exception
import java.net.URI
import java.net.URISyntaxException
@@ -31,9 +30,15 @@ abstract class HttpSource : CatalogueSource {
object : NetworkHelper(Injekt.get<Application>()) {
override val client: OkHttpClient?
get() = delegate?.networkHttpClient ?: original.client
.newBuilder()
.injectPatches { id }
.build()
override val cloudflareClient: OkHttpClient?
get() = delegate?.networkCloudflareClient ?: original.cloudflareClient
.newBuilder()
.injectPatches { id }
.build()
override val cookieManager: AndroidCookieJar
get() = original.cookieManager
@@ -79,9 +84,6 @@ abstract class HttpSource : CatalogueSource {
*/
open val client: OkHttpClient
get() = delegate?.baseHttpClient ?: network.client
.newBuilder()
.detectCaptchas(Injekt.get<Application>(), id, null)
.build()
/**
* Headers builder for requests. Implementations can override this method for custom headers.