Clean code

jkn2008 · Jan 8, 2024 · e0bc1a9 · e0bc1a9
1 parent 5b29901
commit e0bc1a9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
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
@@ -33,7 +33,7 @@ public static String getJson(String url) throws Exception {
     }
 
     private static String fix(String url, String data) {
-        if (url.startsWith("file") || url.startsWith("clan") || url.startsWith("assets")) return UrlUtil.convert(url);
+        if (url.startsWith("file") || url.startsWith("assets")) return UrlUtil.convert(url);
         data = data.replace("./", url.substring(0, url.lastIndexOf("/") + 1));
         return data;
     }

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
@@ -114,7 +114,7 @@ private static void proxy(Live live, String text) {
     private static String getText(String url) {
         if (url.startsWith("file")) return Path.read(url);
         if (url.startsWith("http")) return OkHttp.string(url);
-        if (url.startsWith("clan") || url.startsWith("assets")) return getText(UrlUtil.convert(url));
+        if (url.startsWith("assets")) return getText(UrlUtil.convert(url));
         if (url.length() > 0 && url.length() % 4 == 0) return getText(new String(Base64.decode(url, Base64.DEFAULT)));
         return "";
     }

diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
@@ -216,14 +216,14 @@ private void initOther(JsonObject object) {
 
     private String parseApi(String api) {
         if (api.startsWith("http")) return api;
-        if (api.startsWith("file") || api.startsWith("clan") || api.startsWith("assets")) return UrlUtil.convert(api);
+        if (api.startsWith("file") || api.startsWith("assets")) return UrlUtil.convert(api);
         return api;
     }
 
     private String parseExt(String ext) {
         if (ext.startsWith("http")) return ext;
         if (ext.startsWith("img+")) return Decoder.getExt(ext);
-        if (ext.startsWith("file") || ext.startsWith("clan") || ext.startsWith("assets")) return UrlUtil.convert(ext);
+        if (ext.startsWith("file") || ext.startsWith("assets")) return UrlUtil.convert(ext);
         return ext;
     }
 

diff --git a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java
@@ -37,7 +37,6 @@ public static String path(Uri uri) {
     public static String convert(String url) {
         String host = host(url);
         String scheme = scheme(url);
-        if ("clan".equals(scheme)) fixUrl(url);
         if ("file".equals(scheme)) return Server.get().getAddress(url);
         if ("local".equals(scheme)) return Server.get().getAddress(host);
         if ("assets".equals(scheme)) return Server.get().getAddress(url.substring(9));