From 0702c11fe7fa680bed26d50648f3d60a3e20ca27 Mon Sep 17 00:00:00 2001
From: zhixc <93297256+zhixc@users.noreply.github.com>
Date: Fri, 18 Aug 2023 11:59:42 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ded2k=20=E5=92=8C=20magnet?=
 =?UTF-8?q?=20=E7=A3=81=E5=8A=9B=E9=93=BE=E6=8E=A5=E5=89=A7=E9=9B=86?=
 =?UTF-8?q?=E5=8F=8D=E5=A4=8D=E5=88=87=E6=8D=A2=E5=8F=AF=E8=83=BD=E4=BC=9A?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=20playUrl=20=E4=B8=BAnull=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/github/tvbox/osc/util/thunder/Thunder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/util/thunder/Thunder.java b/app/src/main/java/com/github/tvbox/osc/util/thunder/Thunder.java
index 6340c750..e78b574b 100644
--- a/app/src/main/java/com/github/tvbox/osc/util/thunder/Thunder.java
+++ b/app/src/main/java/com/github/tvbox/osc/util/thunder/Thunder.java
@@ -264,6 +264,7 @@ public class Thunder {
             return true;
         }
         if (url.startsWith("tvbox-oth:")) {
+            stop(false);
             int idx = Integer.parseInt(url.substring(10));
             task_url=ed2kList.get(idx);
             name = XLTaskHelper.instance().getFileName(task_url);
@@ -282,7 +283,7 @@ public class Thunder {
                             break;
                         }
                         String playUrl=getPlayUrl();
-                        if(!playUrl.isEmpty()){
+                        if(playUrl != null && !playUrl.isEmpty()){
                             callback.play(playUrl);
                             return;
                         }

From d2972fc7124d9d2a77101a0e8185ed8e6622f9b4 Mon Sep 17 00:00:00 2001
From: zhixc <93297256+zhixc@users.noreply.github.com>
Date: Fri, 18 Aug 2023 14:22:53 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=88=A0=E9=99=A4=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=80=9F=E5=BA=A6=E8=BF=87=E5=BF=AB=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E7=B4=A2=E5=BC=95=E8=B6=8A=E7=95=8C=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/tvbox/osc/ui/activity/HistoryActivity.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
index 69ba0b8f..55c154b0 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HistoryActivity.java
@@ -99,6 +99,7 @@ public class HistoryActivity extends BaseActivity {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 FastClickCheckUtil.check(view);
+                if (position == -1) return;
                 VodInfo vodInfo = historyAdapter.getData().get(position);
 
 //                HistoryDialog historyDialog = new HistoryDialog().build(mContext, vodInfo).setOnHistoryListener(new HistoryDialog.OnHistoryListener() {

From dd2db1b17ff3e8b4d3d6ea2a1c3a451da860e506 Mon Sep 17 00:00:00 2001
From: zhixc <93297256+zhixc@users.noreply.github.com>
Date: Sat, 19 Aug 2023 05:26:05 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=AD=97=E5=B9=95=E5=8A=A0=E8=BD=BD=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/tvbox/osc/subtitle/DefaultSubtitleEngine.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/subtitle/DefaultSubtitleEngine.java b/app/src/main/java/com/github/tvbox/osc/subtitle/DefaultSubtitleEngine.java
index 785c5d74..c665bb2b 100644
--- a/app/src/main/java/com/github/tvbox/osc/subtitle/DefaultSubtitleEngine.java
+++ b/app/src/main/java/com/github/tvbox/osc/subtitle/DefaultSubtitleEngine.java
@@ -115,7 +115,7 @@ public class DefaultSubtitleEngine implements SubtitleEngine {
                     String subtitleFile = subtitleFileCacheDir + subtitleLoadSuccessResult.fileName;
                     File cacheSubtitleFile = new File(subtitleFile);
                     boolean writeResult = FileUtils.writeSimple(subtitleLoadSuccessResult.content.getBytes(), cacheSubtitleFile);
-                    if (writeResult) {
+                    if (writeResult && playSubtitleCacheKey != null) {
                         CacheManager.save(MD5.string2MD5(getPlaySubtitleCacheKey()), subtitleFile);
                     }
                 } else {