Optimize backup check

pull/586/head
FongMi 2 years ago
parent b47b19e62a
commit 5ab86a3bbc
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  2. 6
      app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java
  3. 3
      app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java
  4. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.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);

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

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

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

Loading…
Cancel
Save