From f9162cd143a6c2a3668770ad0b73c48cfdfde978 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Fri, 31 Oct 2025 14:44:07 +0800 Subject: [PATCH] Remove cache --- .../android/tv/api/config/VodConfig.java | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) 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 index ba2b5eaf8..c3bc3ca24 100644 --- 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 @@ -116,39 +116,24 @@ public class VodConfig { } private void loadConfig(Callback callback) { - loadConfig(callback, loadCache(callback)); - } - - private void loadConfig(Callback callback, boolean silent) { try { String json = Decoder.getJson(UrlUtil.convert(config.getUrl())); JsonObject object = Json.parse(json).getAsJsonObject(); - checkJson(object, callback, silent); - } catch (Throwable e) { - String error = TextUtils.isEmpty(config.getUrl()) ? "" : Notify.getError(R.string.error_config_get, e); - if (!silent) App.post(() -> callback.error(error)); - e.printStackTrace(); - } - } - - private boolean loadCache(Callback callback) { - try { - if (TextUtils.isEmpty(config.getJson())) return false; - parseConfig(Json.parse(config.getJson()).getAsJsonObject(), callback, false); - return true; + checkJson(object, callback); } catch (Throwable e) { + if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error("")); + else App.post(() -> callback.error(Notify.getError(R.string.error_config_get, e))); e.printStackTrace(); - return false; } } - private void checkJson(JsonObject object, Callback callback, boolean silent) { + private void checkJson(JsonObject object, Callback callback) { if (object.has("msg")) { App.post(() -> callback.error(object.get("msg").getAsString())); } else if (object.has("urls")) { parseDepot(object, callback); } else { - parseConfig(object, callback, silent); + parseConfig(object, callback); } } @@ -161,7 +146,7 @@ public class VodConfig { loadConfig(callback); } - private void parseConfig(JsonObject object, Callback callback, boolean silent) { + private void parseConfig(JsonObject object, Callback callback) { try { initSite(object); initParse(object); @@ -170,12 +155,11 @@ public class VodConfig { String notice = Json.safeString(object, "notice"); config.logo(Json.safeString(object, "logo")); config.json(object.toString()).update(); - if (silent || future.isCancelled()) return; + if (future.isCancelled()) return; App.post(() -> callback.success(notice)); App.post(callback::success); } catch (Throwable e) { e.printStackTrace(); - if (silent) return; App.post(() -> callback.error(Notify.getError(R.string.error_config_parse, e))); } }