From fc63c41ab08d0c4565282efab2ec9f0ee7b72af1 Mon Sep 17 00:00:00 2001 From: GG Bond Date: Mon, 4 Dec 2023 20:08:20 +0800 Subject: [PATCH] Cleanup okhttp usage --- .../main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt | 5 ----- app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Okhttp.kt | 1 - 2 files changed, 6 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt index 6fdd23cab..e19048569 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhCookieStore.kt @@ -9,7 +9,6 @@ import io.ktor.http.Cookie import io.ktor.http.Url import io.ktor.http.parseClientCookiesHeader import io.ktor.http.renderSetCookieHeader -import okhttp3.HttpUrl object EhCookieStore : CookiesStorage { private val manager = CookieManager.getInstance() @@ -42,10 +41,6 @@ object EhCookieStore : CookiesStorage { } } - fun deleteCookie(url: HttpUrl, name: String) { - manager.setCookie(url.toString(), "$name=;Max-Age=0") - } - fun addCookie(k: String, v: String, domain: String) { val cookie = Cookie(name = k, value = v, domain = domain, maxAge = Int.MAX_VALUE) val url = if (EhUrl.DOMAIN_E == cookie.domain) EhUrl.HOST_E else EhUrl.HOST_EX diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Okhttp.kt b/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Okhttp.kt index 68e82e952..46b7ed7cc 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Okhttp.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ktbuilder/Okhttp.kt @@ -3,4 +3,3 @@ package com.hippo.ehviewer.ktbuilder import okhttp3.OkHttpClient inline fun httpClient(builder: OkHttpClient.Builder.() -> Unit): OkHttpClient = OkHttpClient.Builder().apply(builder).build() -inline fun httpClient(client: OkHttpClient, builder: OkHttpClient.Builder.() -> Unit): OkHttpClient = client.newBuilder().apply(builder).build()