diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java index aecf2f4f8..9e418675f 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java @@ -146,8 +146,7 @@ public class LiveParser { } private static String getText(Live live) { - if (XtreamParser.isApiUrl(live.getUrl())) return ""; - return getText(live.getUrl(), live.getHeaders()).replace("\r\n", "\n"); + return live.isXtream() ? "" : getText(live.getUrl(), live.getHeaders()).replace("\r\n", "\n"); } private static String getText(String url, Map header) { diff --git a/app/src/main/java/com/fongmi/android/tv/api/XtreamParser.java b/app/src/main/java/com/fongmi/android/tv/api/XtreamParser.java index 28ca63482..508d81880 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/XtreamParser.java +++ b/app/src/main/java/com/fongmi/android/tv/api/XtreamParser.java @@ -18,20 +18,12 @@ public class XtreamParser { return new HttpUrl.Builder().scheme(url.scheme()).host(url.host()).port(url.port()); } - public static boolean isVerify(Uri uri) { - return isApiUrl(uri) || isGetUrl(uri); - } - - public static boolean isApiUrl(String url) { - return isApiUrl(Uri.parse(url)); + public static boolean isVerify(String url) { + return isVerify(Uri.parse(url)); } - public static boolean isApiUrl(Uri uri) { - return uri.getPath() != null && uri.getPath().contains("player_api.php") && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null; - } - - public static boolean isGetUrl(Uri uri) { - return uri.getPath() != null && uri.getPath().contains("get.php") && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null; + public static boolean isVerify(Uri uri) { + return uri.getPath() != null && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null && (uri.getPath().contains("player_api.php") || uri.getPath().contains("get.php")); } public static String getEpgUrl(Live live) { diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java index 9c6bc72b8..8c22ed602 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java @@ -114,7 +114,7 @@ public class LiveConfig { private void loadConfig(Callback callback) { try { - boolean xtream = XtreamParser.isApiUrl(config.getUrl()); + boolean xtream = XtreamParser.isVerify(config.getUrl()); parseConfig(xtream ? "" : Decoder.getJson(config.getUrl()), callback); } catch (Throwable e) { if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));