From a3abd224e89aacba3bb27f64d6c1fb505d1af12e Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sun, 2 Jul 2023 03:13:56 +0800 Subject: [PATCH] Use interceptor to handle cookies instead --- .../net/cronet/okhttptransport/RequestResponseConverter.java | 3 --- app/src/main/java/com/hippo/ehviewer/EhApplication.kt | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/google/net/cronet/okhttptransport/RequestResponseConverter.java b/app/src/main/java/com/google/net/cronet/okhttptransport/RequestResponseConverter.java index 3f773ca67..a6c26ec6e 100644 --- a/app/src/main/java/com/google/net/cronet/okhttptransport/RequestResponseConverter.java +++ b/app/src/main/java/com/google/net/cronet/okhttptransport/RequestResponseConverter.java @@ -18,7 +18,6 @@ package com.google.net.cronet.okhttptransport; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import com.hippo.ehviewer.client.EhCookieStore; import org.chromium.net.CronetEngine; import org.chromium.net.UrlRequest; @@ -95,8 +94,6 @@ final class RequestResponseConverter { for (int i = 0; i < okHttpRequest.headers().size(); i++) { builder.addHeader(okHttpRequest.headers().name(i), okHttpRequest.headers().value(i)); } - var cookies = EhCookieStore.INSTANCE.getCookieHeader(okHttpRequest.url()); - builder.addHeader("Cookie", cookies); RequestBody body = okHttpRequest.body(); diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index a60d39509..df0414665 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -164,8 +164,11 @@ class EhApplication : Application(), ImageLoaderFactory { // TODO: Rewrite CronetInterceptor to use android.net.http.HttpEngine and make it Android 14 only when released addInterceptor { chain -> val request = chain.request() - val response = chain.proceed(request) val url = request.url + val newRequest = request.newBuilder() + .addHeader("Cookie", EhCookieStore.getCookieHeader(url)) + .build() + val response = chain.proceed(newRequest) EhCookieStore.saveFromResponse(url, Cookie.parseAll(url, response.headers)) response }