From f80e04629d8531b1451acf1afe8eb24e73566001 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 29 Mar 2024 15:32:34 +0800 Subject: [PATCH 1/3] Fix crash --- .../main/java/com/fongmi/android/tv/api/config/LiveConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4c2ffd7d9..f7d4e3d85 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 @@ -177,7 +177,7 @@ public class LiveConfig { private int[] getKeep(List items) { String[] splits = Setting.getKeep().split(AppDatabase.SYMBOL); - if (splits.length < 4 || !home.getName().equals(splits[0])) return new int[]{1, 0}; + if (splits.length < 4 || !getHome().getName().equals(splits[0])) return new int[]{1, 0}; for (int i = 0; i < items.size(); i++) { Group group = items.get(i); if (group.getName().equals(splits[1])) { From 24299805722285b8a7208e2a57c0f21e16e95962 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 29 Mar 2024 15:36:35 +0800 Subject: [PATCH 2/3] Fix bug --- app/src/main/java/com/fongmi/android/tv/utils/M3U8.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java b/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java index 2e240fbd0..f1b056469 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java @@ -32,7 +32,7 @@ public class M3U8 { try { if (TextUtils.isEmpty(url)) return ""; Response response = OkHttp.newCall(url, getHeader(headers)).execute(); - if (response.header(HttpHeaders.ACCEPT_RANGES) != null) return ""; + if (response.header(HttpHeaders.ACCEPT_RANGES) != null && !url.contains(".m3u8")) return ""; String result = response.body().string(); Matcher matcher = Pattern.compile("#EXT-X-STREAM-INF(.*)\\n?(.*)").matcher(result.replaceAll("\r\n", "\n")); if (matcher.find() && matcher.groupCount() > 1) return get(UriUtil.resolve(url, matcher.group(2)), headers); @@ -40,8 +40,7 @@ public class M3U8 { for (String line : result.split("\n")) sb.append(shouldResolve(line) ? resolve(url, line) : line).append("\n"); List ads = Sniffer.getRegex(Uri.parse(url)); return clean(sb.toString(), ads); - } catch (Exception e) { - e.printStackTrace(); + } catch (Throwable ignored) { return ""; } } From ae8cd1505b2e8fd1f579b798a043681160a85842 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 23 Mar 2024 09:58:50 +0800 Subject: [PATCH 3/3] Update Util --- app/src/main/java/com/fongmi/android/tv/utils/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java index 848740a90..fcba1a90c 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java @@ -90,7 +90,7 @@ public class Util { if (TextUtils.isEmpty(id)) throw new NullPointerException(); return id; } catch (Exception e) { - return "0200000000000000"; + return "0000000000000000"; } }