pull/211/head
FongMi 2 years ago
parent 1ec1791861
commit 5f25719078
  1. 3
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java
  3. 3
      app/src/main/java/com/fongmi/android/tv/bean/Depot.java
  4. 6
      app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java
  5. 3
      app/src/mobile/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));

@ -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));
}
}

@ -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() {

@ -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;

@ -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));

Loading…
Cancel
Save