From ff43f87d8eb62ffc15e06178e7fbfe6be6aa5cf9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 27 Nov 2023 01:31:02 +0800 Subject: [PATCH] Fix crash --- .../main/java/com/fongmi/android/tv/api/ApiConfig.java | 2 +- .../main/java/com/fongmi/android/tv/api/WallConfig.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 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 938222701..4e9ef79f3 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 @@ -366,7 +366,7 @@ public class ApiConfig { private void setWall(String wall) { this.wall = wall; - boolean load = !TextUtils.isEmpty(wall) && WallConfig.get().isSame(wall); + boolean load = !TextUtils.isEmpty(wall) && WallConfig.get().needSync(wall); if (load) WallConfig.get().config(Config.find(wall, config.getName(), 2).update()); } } \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java index 5da19f7d2..997e71bb8 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/WallConfig.java @@ -22,7 +22,7 @@ public class WallConfig { private Drawable drawable; private Config config; - private boolean same; + private boolean sync; private static class Loader { static volatile WallConfig INSTANCE = new WallConfig(); @@ -56,7 +56,8 @@ public class WallConfig { public WallConfig config(Config config) { this.config = config; - this.same = config.getUrl().equals(ApiConfig.get().getWall()); + if (config.getUrl() == null) return this; + this.sync = config.getUrl().equals(ApiConfig.get().getWall()); return this; } @@ -98,8 +99,8 @@ public class WallConfig { return file; } - public boolean isSame(String url) { - return same || TextUtils.isEmpty(config.getUrl()) || url.equals(config.getUrl()); + public boolean needSync(String url) { + return sync || TextUtils.isEmpty(config.getUrl()) || url.equals(config.getUrl()); } public static void refresh(int index) {