diff --git a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java index 21c11a6a1..8549ae7e9 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java +++ b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java @@ -59,7 +59,7 @@ public class OkCookieJar implements CookieJar { List items = new ArrayList<>(); String cookie = manager.getCookie(url.toString()); if (TextUtils.isEmpty(cookie)) return Collections.emptyList(); - if (url.host().equals("127.0.0.1")) return Collections.emptyList(); + if ("127.0.0.1".equals(url.host())) return Collections.emptyList(); for (String split : cookie.split(";")) add(items, Cookie.parse(url, split)); return items; } catch (Throwable e) { @@ -70,7 +70,7 @@ public class OkCookieJar implements CookieJar { @Override public synchronized void saveFromResponse(@NonNull HttpUrl url, @NonNull List cookies) { try { - if (url.host().equals("127.0.0.1")) return; + if ("127.0.0.1".equals(url.host())) return; for (Cookie cookie : cookies) manager.setCookie(url.toString(), cookie.toString()); } catch (Throwable ignored) { } diff --git a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java index ede457c8f..97c6c7259 100644 --- a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java +++ b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java @@ -43,9 +43,10 @@ public class RequestInterceptor implements Interceptor { private void checkAuthUser(HttpUrl url, Request.Builder builder) { String user = url.uri().getUserInfo(); String auth = url.queryParameter("auth"); + String query = url.querySize() == 0 ? "?" : "&"; if (user != null) userMap.put(url.host(), user); if (auth != null) authMap.put(url.host(), auth); - if (authMap.containsKey(url.host()) && auth == null) builder.url(url + "&auth=" + authMap.get(url.host())); + if (authMap.containsKey(url.host()) && auth == null) builder.url(url + query + "auth=" + authMap.get(url.host())); if (userMap.containsKey(url.host())) builder.header(HttpHeaders.AUTHORIZATION, Util.basic(userMap.get(url.host()))); } }