From 5d2eb675c423ae24e99e8a6723725253de4d2f58 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Tue, 29 Nov 2022 15:20:16 +0800
Subject: [PATCH] =?UTF-8?q?-=20drpy=E8=AF=B7=E6=B1=82=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B45s=20(by=20okjack)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/tvbox/osc/js/DrpyMethods.java     | 11 ++++++++++-
 .../github/tvbox/osc/ui/fragment/PlayFragment.java    |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/js/DrpyMethods.java b/app/src/main/java/com/github/tvbox/osc/js/DrpyMethods.java
index d6a5390a..3df55a5a 100644
--- a/app/src/main/java/com/github/tvbox/osc/js/DrpyMethods.java
+++ b/app/src/main/java/com/github/tvbox/osc/js/DrpyMethods.java
@@ -13,6 +13,7 @@ import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Headers;
 import okhttp3.MediaType;
@@ -70,7 +71,15 @@ public class DrpyMethods {
             } else {
                 client  = OkGoHelper.getNoRedirectClient();
             }
-            Response response = client.newCall(request).execute();
+            OkHttpClient.Builder clientBuilder = client.newBuilder();
+            int timeout = 5000;
+            if (jsonObject.has("timeout")) {
+                timeout = jsonObject.optInt("timeout");
+            }
+            clientBuilder.readTimeout(timeout, TimeUnit.MILLISECONDS);
+            clientBuilder.writeTimeout(timeout, TimeUnit.MILLISECONDS);
+            clientBuilder.connectTimeout(timeout, TimeUnit.MILLISECONDS);
+            Response response = clientBuilder.build().newCall(request).execute();
             JSObject result = new JSObject(module);
             JSObject resultHeaders = new JSObject(module);
             Set<String> names = response.headers().names();
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
index 2b399b21..67f3d829 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
@@ -521,6 +521,7 @@ public class PlayFragment extends BaseLazyFragment {
             url="http://home.jundie.top:666/unBom.php?m3u8="+url;
         }
         String finalUrl = url;
+        if (mActivity == null) return;
         requireActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -1278,6 +1279,7 @@ public class PlayFragment extends BaseLazyFragment {
     }
 
     void stopLoadWebView(boolean destroy) {
+        if (mActivity == null) return;
         requireActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {