From 3bc39ae16b3f9124a71305568ec0fc431ce7ab37 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 16 Aug 2024 22:51:22 +0800
Subject: [PATCH] Fix parse

---
 .../main/java/com/fongmi/android/tv/player/ParseJob.java | 5 +++--
 catvod/src/main/java/com/github/catvod/utils/Json.java   | 9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java
index e63e815e1..799288159 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java
@@ -171,7 +171,8 @@ public class ParseJob implements ParseCallback {
     private boolean isPass(Map<String, String> headers, String url) {
         try {
             if (url.length() < 40) return false;
-            return OkHttp.newCall(url, Headers.of(headers)).execute().code() == 200;
+            int code = OkHttp.newCall(url, Headers.of(headers)).execute().code();
+            return code == 200 || code == 302;
         } catch (Exception e) {
             return false;
         }
@@ -197,7 +198,7 @@ public class ParseJob implements ParseCallback {
 
     private Map<String, String> getHeader(JsonObject object) {
         Map<String, String> headers = new HashMap<>();
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) if (entry.getKey().equalsIgnoreCase(HttpHeaders.USER_AGENT) || entry.getKey().equalsIgnoreCase(HttpHeaders.REFERER) || entry.getKey().equalsIgnoreCase("ua")) headers.put(UrlUtil.fixHeader(entry.getKey()), object.get(entry.getKey()).getAsString());
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) if (!entry.getValue().isJsonNull() && (entry.getKey().equalsIgnoreCase(HttpHeaders.USER_AGENT) || entry.getKey().equalsIgnoreCase(HttpHeaders.REFERER) || entry.getKey().equalsIgnoreCase("ua"))) headers.put(UrlUtil.fixHeader(entry.getKey()), entry.getValue().getAsString());
         if (headers.isEmpty()) return parse.getHeaders();
         return headers;
     }
diff --git a/catvod/src/main/java/com/github/catvod/utils/Json.java b/catvod/src/main/java/com/github/catvod/utils/Json.java
index 20c93cbeb..3a3c1c72e 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Json.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Json.java
@@ -2,8 +2,6 @@ package com.github.catvod.utils;
 
 import android.text.TextUtils;
 
-import androidx.collection.ArrayMap;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -82,13 +80,6 @@ public class Json {
         return map;
     }
 
-    public static ArrayMap<String, String> toArrayMap(JsonElement element) {
-        ArrayMap<String, String> map = new ArrayMap<>();
-        JsonObject object = safeObject(element);
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) map.put(entry.getKey(), safeString(object, entry.getKey()));
-        return map;
-    }
-
     public static JsonObject toObject(Map<String, String> map) {
         JsonObject object = new JsonObject();
         for (String key : map.keySet()) object.addProperty(key, map.get(key));