From 6e84aa0d1993f8d6b3d75d5e65490651e09522a4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 14 Feb 2023 23:07:57 +0800
Subject: [PATCH] Update to 1.6.5

---
 app/build.gradle                                 |  4 ++--
 .../fongmi/android/tv/player/parse/ParseJob.java | 16 +++++++---------
 forcetech/src/main/AndroidManifest.xml           |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 151061a5c..77d890052 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 29
-        versionCode 64
-        versionName "1.6.4"
+        versionCode 65
+        versionName "1.6.5"
         ndk { abiFilters "armeabi-v7a" }
     }
 
diff --git a/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java b/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
index 8631ad7f7..b3d95054e 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/parse/ParseJob.java
@@ -24,7 +24,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Headers;
-import okhttp3.Response;
 
 public class ParseJob implements ParseCallback {
 
@@ -99,10 +98,12 @@ public class ParseJob implements ParseCallback {
     }
 
     private void jsonParse(Parse item, String webUrl, boolean error) throws Exception {
-        Response response = OkHttp.newCall(item.getUrl() + webUrl, Headers.of(item.getHeaders())).execute();
-        JsonObject object = JsonParser.parseString(response.body().string()).getAsJsonObject();
+        String body = OkHttp.newCall(item.getUrl() + webUrl, Headers.of(item.getHeaders())).execute().body().string();
+        JsonObject object = JsonParser.parseString(body).getAsJsonObject();
         object = object.has("data") ? object.getAsJsonObject("data") : object;
-        checkResult(getHeader(object), Json.safeString(object, "url"), item.getName(), error);
+        boolean illegal = body.contains("不存在") || body.contains("已过期");
+        String url = illegal ? "" : Json.safeString(object, "url");
+        checkResult(getHeader(object), url, item.getName(), error);
     }
 
     private void jsonExtend(String webUrl) throws Exception {
@@ -153,11 +154,8 @@ public class ParseJob implements ParseCallback {
 
     private boolean isPass(Map<String, String> headers, String url) {
         try {
-            Response response = OkHttp.newCall(url, Headers.of(headers)).execute();
-            Map<String, List<String>> respHeader = response.headers().toMultimap();
-            if (response.code() != 200 || url.length() < 40) return false;
-            if (respHeader.containsKey("content-length") && Integer.parseInt(respHeader.get("content-length").get(0)) < 10 * 1024) return false;
-            return true;
+            int code = OkHttp.newCall(url, Headers.of(headers)).execute().code();
+            return code == 200 && url.length() >= 40;
         } catch (Exception e) {
             return false;
         }
diff --git a/forcetech/src/main/AndroidManifest.xml b/forcetech/src/main/AndroidManifest.xml
index dfb7a7138..014923565 100644
--- a/forcetech/src/main/AndroidManifest.xml
+++ b/forcetech/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
         <service
             android:name="com.forcetech.service.P5PService"
             android:exported="false"
-            android:process=":p9p" />
+            android:process=":p5p" />
 
         <service
             android:name="com.forcetech.service.P6PService"