From 5ab86a3bbc15cd402459209f6b2147549116387b Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 4 Jul 2024 18:26:20 +0800 Subject: [PATCH] Optimize backup check --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 2 +- .../java/com/fongmi/android/tv/api/config/VodConfig.java | 6 +++++- app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java | 3 +++ .../com/fongmi/android/tv/ui/activity/MainActivity.java | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 8fe5e14ae..b79b589b1 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -184,7 +184,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void error(String msg) { - if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) RestoreDialog.create(getActivity()).show(); + if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists() && !VodConfig.hasUrl() && !LiveConfig.hasUrl()) RestoreDialog.create(getActivity()).show(); mBinding.progressLayout.showContent(); mResult = Result.empty(); Notify.show(msg); 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 bcf7da356..ebe56d922 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 @@ -75,8 +75,12 @@ public class VodConfig { return get().getSites().indexOf(get().getHome()); } + public static boolean hasUrl() { + return getUrl() != null && getUrl().length() > 0; + } + public static boolean hasParse() { - return get().getParses().size() > 0; + return !get().getParses().isEmpty(); } public static void load(Config config, Callback callback) { diff --git a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java index 1314dd76c..784472e09 100644 --- a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java +++ b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java @@ -8,6 +8,8 @@ import androidx.room.RoomDatabase; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Setting; +import com.fongmi.android.tv.api.config.LiveConfig; +import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Config; import com.fongmi.android.tv.bean.Device; import com.fongmi.android.tv.bean.History; @@ -46,6 +48,7 @@ public abstract class AppDatabase extends RoomDatabase { } public static void backup() { + if (!VodConfig.hasUrl() && !LiveConfig.hasUrl()) return; if (Setting.getBackupMode() == 0) backup(new com.fongmi.android.tv.impl.Callback()); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index 315f8a465..176dc702a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -118,7 +118,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt @Override public void error(String msg) { - if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) showDialog(); + if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists() && !VodConfig.hasUrl() && !LiveConfig.hasUrl()) showDialog(); RefreshEvent.config(); StateEvent.empty(); Notify.show(msg);