From e81e06c256f9bb07126b2b7f6151074c120e9244 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Fri, 30 Sep 2022 19:56:51 +0800
Subject: [PATCH] =?UTF-8?q?-=20parse=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/tvbox/osc/ui/activity/PlayActivity.java | 14 ++++++++++----
 .../github/tvbox/osc/ui/fragment/PlayFragment.java | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
index b75f1ef3..7c0dd5a0 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
@@ -1347,7 +1347,7 @@ public class PlayActivity extends BaseActivity {
 
         WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
             if (url.endsWith("/favicon.ico")) {
-                return null;
+                return new WebResourceResponse("image/png", null, null);
             }
             LOG.i("shouldInterceptRequest url:" + url);
             boolean ad;
@@ -1381,7 +1381,10 @@ public class PlayActivity extends BaseActivity {
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
             WebResourceResponse response = checkIsVideo(url, null);
-            return response;
+            if (response == null)
+                return super.shouldInterceptRequest(view, url);
+            else
+                return response;
         }
 
         @Nullable
@@ -1406,7 +1409,10 @@ public class PlayActivity extends BaseActivity {
                 th.printStackTrace();
             }
             WebResourceResponse response = checkIsVideo(url, webHeaders);
-            return response;
+            if (response == null)
+                return super.shouldInterceptRequest(view, request);
+            else
+                return response;
         }
 
         @Override
@@ -1513,7 +1519,7 @@ public class PlayActivity extends BaseActivity {
             String url = request.getUrl().toString();
             // suppress favicon requests as we don't display them anywhere
             if (url.endsWith("/favicon.ico")) {
-                return null;
+                return createXWalkWebResourceResponse("image/png", null, null);
             }
             LOG.i("shouldInterceptLoadRequest url:" + url);
             boolean ad;
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 ef6bbe96..ab71698b 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
@@ -1366,7 +1366,7 @@ public class PlayFragment extends BaseLazyFragment {
 
         WebResourceResponse checkIsVideo(String url, HashMap<String, String> headers) {
             if (url.endsWith("/favicon.ico")) {
-                return null;
+                return new WebResourceResponse("image/png", null, null);
             }
             LOG.i("shouldInterceptRequest url:" + url);
             boolean ad;
@@ -1400,7 +1400,10 @@ public class PlayFragment extends BaseLazyFragment {
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
             WebResourceResponse response = checkIsVideo(url, null);
-            return response;
+            if (response == null)
+                return super.shouldInterceptRequest(view, url);
+            else
+                return response;
         }
 
         @Nullable
@@ -1425,7 +1428,10 @@ public class PlayFragment extends BaseLazyFragment {
                 th.printStackTrace();
             }
             WebResourceResponse response = checkIsVideo(url, webHeaders);
-            return response;
+            if (response == null)
+                return super.shouldInterceptRequest(view, request);
+            else
+                return response;
         }
 
         @Override
@@ -1532,7 +1538,7 @@ public class PlayFragment extends BaseLazyFragment {
             String url = request.getUrl().toString();
             // suppress favicon requests as we don't display them anywhere
             if (url.endsWith("/favicon.ico")) {
-                return null;
+                return createXWalkWebResourceResponse("image/png", null, null);
             }
             LOG.i("shouldInterceptLoadRequest url:" + url);
             boolean ad;