diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java index 7515e306..c4c0e023 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -85,7 +85,7 @@ public class Bili extends Spider { @Override public void init(Context context, String extend) throws Exception { - this.extend = Json.parse(extend).getAsJsonObject(); + this.extend = Json.safeObject(extend); setCookie(); setAudio(); } diff --git a/app/src/main/java/com/github/catvod/spider/Wogg.java b/app/src/main/java/com/github/catvod/spider/Wogg.java index 3ff57c44..5f41d0bf 100644 --- a/app/src/main/java/com/github/catvod/spider/Wogg.java +++ b/app/src/main/java/com/github/catvod/spider/Wogg.java @@ -42,7 +42,7 @@ public class Wogg extends Ali { @Override public void init(Context context, String extend) { - ext = Json.parse(extend).getAsJsonObject(); + ext = Json.safeObject(extend); super.init(context, ext.has("token") ? ext.get("token").getAsString() : ""); } diff --git a/app/src/main/java/com/github/catvod/utils/Json.java b/app/src/main/java/com/github/catvod/utils/Json.java index 29bb493a..8f41fcac 100644 --- a/app/src/main/java/com/github/catvod/utils/Json.java +++ b/app/src/main/java/com/github/catvod/utils/Json.java @@ -1,6 +1,7 @@ package com.github.catvod.utils; import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.google.gson.JsonParser; public class Json { @@ -12,4 +13,13 @@ public class Json { return new JsonParser().parse(json); } } + + public static JsonObject safeObject(String json) { + try { + JsonObject obj = parse(json).getAsJsonObject(); + return obj == null ? new JsonObject() : obj; + } catch (Throwable e) { + return new JsonObject(); + } + } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index d77aacce..eab91be7 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 07697376..a4916d49 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -73e1be1009c6a267fc30ea51b446e304 +4795d43e5d59d58d6d4a92361f73974e