From 2aa72081d9ecd111b7532d2f3aa52fd3875b6b72 Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Sun, 31 Mar 2024 10:24:30 +0800
Subject: [PATCH] merge

---
 .../java/com/fongmi/android/tv/api/config/LiveConfig.java    | 2 +-
 app/src/main/java/com/fongmi/android/tv/utils/M3U8.java      | 5 ++---
 app/src/main/java/com/fongmi/android/tv/utils/Util.java      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

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<Group> 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])) {
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 9ff915f6c..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 (!url.contains(".m3u8")) 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<String> ads = Sniffer.getRegex(Uri.parse(url));
             return clean(sb.toString(), ads);
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Throwable ignored) {
             return "";
         }
     }
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";
         }
     }