From 75c43d6edc6d336106f32cf5ed9752d15bc3b3c8 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 19 Dec 2023 18:23:50 +0800
Subject: [PATCH] Fix + bug

---
 app/src/main/java/com/fongmi/android/tv/server/Server.java | 7 +++----
 catvod/src/main/java/com/github/catvod/net/OkHttp.java     | 1 -
 .../main/java/com/github/catvod/net/OkhttpInterceptor.java | 7 +++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/server/Server.java b/app/src/main/java/com/fongmi/android/tv/server/Server.java
index 7ec139be5..2a8dd7610 100644
--- a/app/src/main/java/com/fongmi/android/tv/server/Server.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/Server.java
@@ -40,10 +40,9 @@ public class Server {
     }
 
     public void go() {
-        if (goThread == null) {
-            goThread = new Thread(Go_proxy_video::start);
-            goThread.start();
-        }
+        if (goThread != null) goThread.interrupt();
+        goThread = new Thread(Go_proxy_video::start);
+        goThread.start();
     }
 
     public void start() {
diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
index d3ee01e0a..b3f719f49 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -90,7 +90,6 @@ public class OkHttp {
 
     public static String string(String url) {
         try {
-            if (url.contains("/file://")) url = url.replace("+", "%2B");
             return url.startsWith("http") ? newCall(url).execute().body().string() : "";
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java b/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java
index 23c9aa443..5884b2d0e 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkhttpInterceptor.java
@@ -49,7 +49,10 @@ public class OkhttpInterceptor implements Interceptor {
 
     private Request getRequest(@NonNull Chain chain) {
         Request request = chain.request();
-        if (request.url().host().equals("gitcode.net")) return request.newBuilder().addHeader(HttpHeaders.USER_AGENT, Util.CHROME).build();
-        return request;
+        String url = request.url().toString();
+        Request.Builder builder = request.newBuilder();
+        if (url.contains("/file://")) builder.url(url.replace("+", "%2B"));
+        if (url.contains("gitcode.net")) builder.addHeader(HttpHeaders.USER_AGENT, Util.CHROME);
+        return builder.build();
     }
 }