Remove backup key check

pull/212/head
FongMi 2 years ago
parent e42f91a114
commit d8598e2388
  1. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  2. 11
      app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java

@ -176,7 +176,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
@Override
public void error(String msg) {
if (TextUtils.isEmpty(msg) && AppDatabase.getBackupKey().exists()) onRestore();
if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) onRestore();
else mBinding.progressLayout.showContent();
mResult = Result.empty();
Notify.show(msg);

@ -49,13 +49,12 @@ public abstract class AppDatabase extends RoomDatabase {
return instance;
}
public static String getDate() {
File db = new File(Path.tv(), NAME);
return Setting.isBackupAuto() ? ResUtil.getString(R.string.setting_backup_auto) : getBackupKey().exists() && db.exists() ? Util.format(new SimpleDateFormat("MMddHHmmss", Locale.getDefault()), db.lastModified()) : "";
public static File getBackup() {
return new File(Path.tv(), NAME);
}
public static File getBackupKey() {
return new File(Path.tv(), "." + Util.getDeviceId());
public static String getDate() {
return Setting.isBackupAuto() ? ResUtil.getString(R.string.setting_backup_auto) : getBackup().exists() ? Util.format(new SimpleDateFormat("MMddHHmmss", Locale.getDefault()), getBackup().lastModified()) : "";
}
public static void backup() {
@ -71,7 +70,6 @@ public abstract class AppDatabase extends RoomDatabase {
if (wal.exists()) Path.copy(wal, new File(Path.tv(), wal.getName()));
if (shm.exists()) Path.copy(shm, new File(Path.tv(), shm.getName()));
Prefers.backup(new File(Path.tv(), NAME + "-pref"));
Path.newFile(getBackupKey());
App.post(callback::success);
});
}
@ -87,7 +85,6 @@ public abstract class AppDatabase extends RoomDatabase {
if (shm.exists()) Path.move(shm, App.get().getDatabasePath(shm.getName()).getAbsoluteFile());
if (pref.exists()) Prefers.restore(pref);
App.post(callback::success);
Path.clear(Path.tv());
});
}

@ -118,7 +118,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
@Override
public void error(String msg) {
if (TextUtils.isEmpty(msg) && AppDatabase.getBackupKey().exists()) onRestore();
if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) onRestore();
else RefreshEvent.empty();
RefreshEvent.config();
Notify.show(msg);

Loading…
Cancel
Save