diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java index 98064304b..4cfaab67f 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Parse.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Parse.java @@ -81,10 +81,6 @@ public class Parse { this.activated = item.equals(this); } - public boolean hasHeader() { - return getExt().getHeader() != null; - } - public JsonElement getHeader() { return getExt().getHeader(); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index 37627f35f..c523e20e9 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -24,7 +24,6 @@ import org.simpleframework.xml.core.Persister; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -155,12 +154,8 @@ public class Result { this.url = url; } - public boolean hasHeader() { - return getHeader() != null; - } - public Map getHeaders() { - return hasHeader() ? Json.toMap(getHeader()) : new HashMap<>(); + return Json.toMap(getHeader()); } @NonNull diff --git a/app/src/main/java/com/fongmi/android/tv/player/ParseTask.java b/app/src/main/java/com/fongmi/android/tv/player/ParseTask.java index e4f326703..17812fe1d 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ParseTask.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ParseTask.java @@ -69,9 +69,7 @@ public class ParseTask { private void jsonParse(String webUrl) { try { - Headers reqHeader = new Headers.Builder().build(); - if (parse.hasHeader()) reqHeader = Headers.of(Json.toMap(parse.getHeader())); - Response response = OKHttp.newCall(parse.getUrl() + webUrl, reqHeader).execute(); + Response response = OKHttp.newCall(parse.getUrl() + webUrl, Headers.of(Json.toMap(parse.getHeader()))).execute(); JsonObject object = JsonParser.parseString(response.body().string()).getAsJsonObject(); HashMap headers = new HashMap<>(); for (String key : object.keySet()) if (key.equalsIgnoreCase("user-agent") || key.equalsIgnoreCase("referer")) headers.put(key, object.get(key).getAsString());