From 69cdbad643558480d090a5435a76c2691c8fafad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E6=B1=A0?= <whitechi73@outlook.com>
Date: Fri, 8 Mar 2024 01:19:26 +0800
Subject: [PATCH] `Shamrock`: rm CIO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 白池 <whitechi73@outlook.com>
---
 app/build.gradle.kts                          |  3 +-
 xposed/build.gradle.kts                       |  3 +-
 .../moe/fuqiuluo/shamrock/tools/KtorClient.kt | 34 ++-----------------
 3 files changed, 5 insertions(+), 35 deletions(-)

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