diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 64fffd2..f203135 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -202,8 +202,7 @@ dependencies { implementation(kotlinx("io-jvm", "0.1.16")) implementation(ktor("client", "core")) - implementation(ktor("client", "content-negotiation")) - implementation(ktor("client", "cio")) + implementation(ktor("client", "okhttp")) implementation(ktor("serialization", "kotlinx-json")) implementation(project(":xposed")) diff --git a/xposed/build.gradle.kts b/xposed/build.gradle.kts index 8c5c967..9dd0046 100644 --- a/xposed/build.gradle.kts +++ b/xposed/build.gradle.kts @@ -82,8 +82,7 @@ dependencies { implementation(kotlinx("serialization-protobuf", "1.6.2")) implementation(ktor("client", "core")) - implementation(ktor("client", "content-negotiation")) - implementation(ktor("client", "cio")) + implementation(ktor("client", "okhttp")) implementation(ktor("serialization", "kotlinx-json")) implementation(ktor("network", "tls-certificates")) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/KtorClient.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/KtorClient.kt index 5abeb84..f5f4d7d 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/KtorClient.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/KtorClient.kt @@ -1,43 +1,15 @@ package moe.fuqiuluo.shamrock.tools import io.ktor.client.HttpClient +import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.plugins.HttpTimeout -import io.ktor.client.plugins.contentnegotiation.ContentNegotiation -import io.ktor.serialization.kotlinx.json.json -import kotlinx.serialization.json.Json -val GlobalClient: HttpClient by lazy { - HttpClient { - //install(HttpCookies) +val GlobalClient by lazy { + HttpClient(OkHttp) { install(HttpTimeout) { requestTimeoutMillis = 15000 connectTimeoutMillis = 15000 socketTimeoutMillis = 15000 } - install(ContentNegotiation) { - json(Json { - prettyPrint = true - isLenient = true - }) - } - } -} - -val GlobalClientNoRedirect: HttpClient by lazy { - HttpClient { - //install(HttpCookies) - followRedirects = false - - install(HttpTimeout) { - requestTimeoutMillis = 15000 - connectTimeoutMillis = 15000 - socketTimeoutMillis = 15000 - } - install(ContentNegotiation) { - json(Json { - prettyPrint = true - isLenient = true - }) - } } } \ No newline at end of file