diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java index aaebb89e3..db350d43e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java @@ -23,7 +23,6 @@ import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.custom.CustomTextListener; import com.fongmi.android.tv.utils.QRCode; import com.fongmi.android.tv.utils.ResUtil; -import com.fongmi.android.tv.utils.UrlUtil; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.permissionx.guolindev.PermissionX; @@ -141,7 +140,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { } private void onPositive(View view) { - String text = UrlUtil.fixUrl(binding.text.getText().toString().trim()); + String text = binding.text.getText().toString().trim(); if (edit) Config.find(url, type).url(text).update(); if (text.isEmpty()) Config.delete(url, type); callback.setConfig(Config.find(text, type)); diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java index d07ec37b7..843f10340 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java @@ -92,7 +92,7 @@ public class JarLoader { load(key, download(jar)); } else if (jar.startsWith("file")) { load(key, Path.local(jar)); - } else if (!jar.isEmpty()) { + } else if (jar.startsWith("assets")) { parseJar(key, UrlUtil.convert(jar)); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Depot.java b/app/src/main/java/com/fongmi/android/tv/bean/Depot.java index 4b496c1e2..49d7bf522 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Depot.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Depot.java @@ -3,7 +3,6 @@ package com.fongmi.android.tv.bean; import android.text.TextUtils; import com.fongmi.android.tv.App; -import com.fongmi.android.tv.utils.UrlUtil; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; @@ -25,7 +24,7 @@ public class Depot { } public String getUrl() { - return TextUtils.isEmpty(url) ? "" : UrlUtil.fixUrl(url); + return TextUtils.isEmpty(url) ? "" : url; } public String getName() { 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 index 4ac0efc78..ca8aef505 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java @@ -44,12 +44,6 @@ public class UrlUtil { return url; } - public static String fixUrl(String url) { - if (url.contains("/localhost/")) url = url.replace("/localhost/", "/"); - if (url.startsWith("clan")) url = url.replace("clan", "file"); - return url; - } - public static String fixHeader(String key) { if (key.equalsIgnoreCase(HttpHeaders.USER_AGENT)) return HttpHeaders.USER_AGENT; if (key.equalsIgnoreCase(HttpHeaders.REFERER)) return HttpHeaders.REFERER; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java index f4aa9de7c..590911590 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java @@ -18,7 +18,6 @@ import com.fongmi.android.tv.databinding.DialogConfigBinding; import com.fongmi.android.tv.impl.ConfigCallback; import com.fongmi.android.tv.ui.custom.CustomTextListener; import com.fongmi.android.tv.utils.FileChooser; -import com.fongmi.android.tv.utils.UrlUtil; import com.google.android.material.dialog.MaterialAlertDialogBuilder; public class ConfigDialog { @@ -122,8 +121,8 @@ public class ConfigDialog { } private void onPositive(DialogInterface dialog, int which) { + String url = binding.url.getText().toString().trim(); String name = binding.name.getText().toString().trim(); - String url = UrlUtil.fixUrl(binding.url.getText().toString().trim()); if (edit) Config.find(ori, type).url(url).name(name).update(); if (url.isEmpty()) Config.delete(ori, type); callback.setConfig(Config.find(url, type));