Merge pull request #101 from zhixc/dev

merge By zhixc

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 {

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() {

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;
                         }