From 74af3e2eaa6df9d70f5b756027831c66bb13df40 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Nov 2022 15:23:08 +0800 Subject: [PATCH] Fix special ext --- app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java | 1 + app/src/main/java/com/fongmi/android/tv/api/Decoder.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index bbd68ccd1..eca557c92 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -168,6 +168,7 @@ public class ApiConfig { if (ext.startsWith("http")) return ext; else if (ext.startsWith("file")) return FileUtil.read(ext); else if (ext.startsWith("img+")) return Decoder.getExt(ext); + else if (ext.contains("http") || ext.contains("file")) return ext; else if (ext.endsWith(".json") || ext.endsWith(".py")) return parseExt(Utils.convert(ext)); return ext; } diff --git a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java index c1f0b2ad8..de27a4459 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/Decoder.java +++ b/app/src/main/java/com/fongmi/android/tv/api/Decoder.java @@ -88,9 +88,7 @@ public class Decoder { private static String extract(String data) { Matcher matcher = Pattern.compile("[A-Za-z0-9]{8}\\*\\*").matcher(data); - if (!matcher.find()) return ""; - String key = matcher.group(); - return data.substring(data.indexOf(key) + key.length()); + return matcher.find() ? data.substring(data.indexOf(matcher.group()) + 10) : ""; } private static byte[] padEnd(String key) {