diff --git a/app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java b/app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java
index 70427cfbc..65263fb08 100644
--- a/app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/gson/FilterAdapter.java
@@ -11,6 +11,7 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 public class FilterAdapter implements JsonDeserializer<LinkedHashMap<String, List<Filter>>> {
 
@@ -19,12 +20,12 @@ public class FilterAdapter implements JsonDeserializer<LinkedHashMap<String, Lis
         LinkedHashMap<String, List<Filter>> filterMap = new LinkedHashMap<>();
         JsonObject filters = json.getAsJsonObject();
         if (filters == null) return filterMap;
-        for (String key : filters.keySet()) {
+        for (Map.Entry<String, JsonElement> entry : filters.entrySet()) {
             List<Filter> items = new ArrayList<>();
-            JsonElement element = filters.get(key);
+            JsonElement element = filters.get(entry.getKey());
             if (element.isJsonObject()) items.add(Filter.objectFrom(element).check().trans());
             else for (JsonElement item : element.getAsJsonArray()) items.add(Filter.objectFrom(item).check().trans());
-            filterMap.put(key, items);
+            filterMap.put(entry.getKey(), items);
         }
         return filterMap;
     }
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 b1fd8dd68..66c2cb093 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
@@ -11,6 +11,7 @@ import com.fongmi.android.tv.utils.UrlUtil;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Json;
 import com.google.common.net.HttpHeaders;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import java.util.ArrayList;
@@ -187,7 +188,7 @@ public class ParseJob implements ParseCallback {
 
     private Map<String, String> getHeader(JsonObject object) {
         Map<String, String> headers = new HashMap<>();
-        for (String key : object.keySet()) if (key.equalsIgnoreCase(HttpHeaders.USER_AGENT) || key.equalsIgnoreCase(HttpHeaders.REFERER)) headers.put(UrlUtil.fixHeader(key), object.get(key).getAsString());
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) if (entry.getKey().equalsIgnoreCase(HttpHeaders.USER_AGENT) || entry.getKey().equalsIgnoreCase(HttpHeaders.REFERER)) headers.put(UrlUtil.fixHeader(entry.getKey()), object.get(entry.getKey()).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 191906d8d..77ffbbb23 100644
--- a/catvod/src/main/java/com/github/catvod/utils/Json.java
+++ b/catvod/src/main/java/com/github/catvod/utils/Json.java
@@ -72,14 +72,14 @@ public class Json {
     public static Map<String, String> toMap(JsonElement element) {
         Map<String, String> map = new HashMap<>();
         JsonObject object = safeObject(element);
-        for (String key : object.keySet()) map.put(key, safeString(object, key));
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) map.put(entry.getKey(), safeString(object, entry.getKey()));
         return map;
     }
 
     public static ArrayMap<String, String> toArrayMap(JsonElement element) {
         ArrayMap<String, String> map = new ArrayMap<>();
         JsonObject object = safeObject(element);
-        for (String key : object.keySet()) map.put(key, safeString(object, key));
+        for (Map.Entry<String, JsonElement> entry : object.entrySet()) map.put(entry.getKey(), safeString(object, entry.getKey()));
         return map;
     }