From b2bef7a4b0ec7b52ef7f1c35d401193a7cd6dbbd Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 8 Mar 2018 20:35:02 +0800
Subject: [PATCH] Update okhttp

---
 app/build.gradle                              |  3 ++
 .../hippo/ehviewer/client/EhCookieStore.java  | 28 ++++---------------
 .../com/hippo/network/CookieRepository.java   |  3 +-
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2c3491e97..070b0d158 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -76,6 +76,7 @@ dependencies {
     compile 'com.github.seven332:yorozuya-thread:0.1.1'
     compile 'com.github.seven332:yorozuya-collect:0.1.4'
     compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.9.2'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'org.greenrobot:greendao:2.2.1'
     compile 'org.jsoup:jsoup:1.11.2'
@@ -89,5 +90,7 @@ configurations.all {
         force 'com.github.seven332:glgallery:0f276c0'
         force 'com.github.seven332:glview-image:4c744db'
         force 'com.github.seven332:image:bab9b11'
+
+        exclude group: 'com.github.seven332', module: 'okhttp'
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java
index 089d43432..59f1daf14 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhCookieStore.java
@@ -26,7 +26,6 @@ import java.util.List;
 
 import okhttp3.Cookie;
 import okhttp3.HttpUrl;
-import okhttp3.Request;
 
 public class EhCookieStore extends CookieRepository {
 
@@ -86,41 +85,26 @@ public class EhCookieStore extends CookieRepository {
     }
 
     @Override
-    public List<Cookie> loadForRequest(HttpUrl url, Request request) {
-        List<Cookie> cookies = super.loadForRequest(url, request);
-        Object tag = request.tag();
+    public List<Cookie> loadForRequest(HttpUrl url) {
+        List<Cookie> cookies = super.loadForRequest(url);
 
         boolean checkTips = domainMatch(url, EhUrl.DOMAIN_E);
-        boolean checkUconfig = (domainMatch(url, EhUrl.DOMAIN_E) || domainMatch(url, EhUrl.DOMAIN_EX)) && tag instanceof EhConfig;
 
-        if (checkTips || checkUconfig) {
+        if (checkTips) {
             List<Cookie> result = new ArrayList<>(cookies.size() + 1);
             // Add all but skip some
             for (Cookie cookie: cookies) {
                 String name = cookie.name();
-                if (checkTips && EhConfig.KEY_CONTENT_WARNING.equals(name)) {
+                if (EhConfig.KEY_CONTENT_WARNING.equals(name)) {
                     continue;
                 }
-                if (checkUconfig && EhConfig.KEY_UCONFIG.equals(name)) {
+                if (EhConfig.KEY_UCONFIG.equals(name)) {
                     continue;
                 }
                 result.add(cookie);
             }
             // Add some
-            if (checkTips) {
-                result.add(sTipsCookie);
-            }
-            if (checkUconfig) {
-                EhConfig ehConfig = (EhConfig) tag;
-                Cookie uconfigCookie = new Cookie.Builder()
-                        .name(EhConfig.KEY_UCONFIG)
-                        .value(ehConfig.uconfig())
-                        .domain(url.host())
-                        .path("/")
-                        .expiresAt(Long.MAX_VALUE)
-                        .build();
-                result.add(uconfigCookie);
-            }
+            result.add(sTipsCookie);
             return Collections.unmodifiableList(result);
         } else {
             return cookies;
diff --git a/app/src/main/java/com/hippo/network/CookieRepository.java b/app/src/main/java/com/hippo/network/CookieRepository.java
index 9fab98c15..d776a745e 100644
--- a/app/src/main/java/com/hippo/network/CookieRepository.java
+++ b/app/src/main/java/com/hippo/network/CookieRepository.java
@@ -31,7 +31,6 @@ import java.util.regex.Pattern;
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.HttpUrl;
-import okhttp3.Request;
 
 public class CookieRepository implements CookieJar {
 
@@ -146,7 +145,7 @@ public class CookieRepository implements CookieJar {
   }
 
   @Override
-  public List<Cookie> loadForRequest(HttpUrl httpUrl, Request request) {
+  public List<Cookie> loadForRequest(HttpUrl httpUrl) {
     return getCookies(httpUrl);
   }