Fix sniffer crash

pull/123/head
FongMi 3 years ago
parent 3c785fe6db
commit 3cc45dcd8b
  1. 14
      app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/utils/Utils.java

@ -112,7 +112,7 @@ public class CustomWebView extends WebView {
for (String key : headers.keySet()) if (keys.contains(key.toLowerCase())) news.put(key, headers.get(key));
App.removeCallbacks(mTimer);
App.post(() -> {
if (callback != null) callback.onParseSuccess(news, url, "");
onSuccess(news, url);
stop(false);
});
}
@ -121,7 +121,17 @@ public class CustomWebView extends WebView {
stopLoading();
loadUrl("about:blank");
App.removeCallbacks(mTimer);
if (error) App.post(() -> callback.onParseError());
if (error) App.post(this::onError);
else callback = null;
}
private void onSuccess(Map<String, String> news, String url) {
if (callback != null) callback.onParseSuccess(news, url, "");
callback = null;
}
private void onError() {
if (callback != null) callback.onParseError();
callback = null;
}
}

@ -70,7 +70,7 @@ public class Utils {
public static boolean isVideoFormat(String url, Map<String, String> headers) {
if (Sniffer.CUSTOM.matcher(url).find()) return true;
if (headers.containsKey("Accept") && headers.get("Accept").startsWith("image")) return false;
if (url.contains(".js") || url.contains(".css")) return false;
if (url.contains("url=http") || url.contains(".js") || url.contains(".css")) return false;
return Sniffer.RULE.matcher(url).find();
}

Loading…
Cancel
Save